From 69662e4923e06b499ad285f935bf0cec673afc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 21 Apr 2013 12:42:42 +0200 Subject: [PATCH] Updated FindCorrade.cmake and FindNodeJs.cmake from Corrade repository. --- modules/FindCorrade.cmake | 5 +++++ modules/FindNodeJs.cmake | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 modules/FindNodeJs.cmake diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index 04b90ddd9..9ce850420 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -28,6 +28,7 @@ # Native Client with `newlib` toolchain # CORRADE_TARGET_NACL_GLIBC - Defined if compiled for Google Chrome # Native Client with `glibc` toolchain +# CORRADE_TARGET_EMSCRIPTEN - Defined if compiled for Emscripten # # Corrade provides these macros and functions: # @@ -172,6 +173,10 @@ string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_NACL_GLIBC" _TARGET_N if(NOT _TARGET_NACL_GLIBC EQUAL -1) set(CORRADE_TARGET_NACL_GLIBC 1) endif() +string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_EMSCRIPTEN" _TARGET_EMSCRIPTEN) +if(NOT _TARGET_EMSCRIPTEN EQUAL -1) + set(CORRADE_TARGET_EMSCRIPTEN 1) +endif() set(CORRADE_UTILITY_LIBRARIES ${CORRADE_UTILITY_LIBRARY}) set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES}) diff --git a/modules/FindNodeJs.cmake b/modules/FindNodeJs.cmake new file mode 100644 index 000000000..90f7ebf21 --- /dev/null +++ b/modules/FindNodeJs.cmake @@ -0,0 +1,37 @@ +# - Find Node.js +# +# This module defines: +# +# NODEJS_FOUND - True if Node.js executable is found +# NODEJS_EXECUTABLE - Node.js executable +# + +# +# This file is part of Corrade. +# +# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013 +# Vladimír Vondruš +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +find_program(NODEJS_EXECUTABLE node) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args("NodeJs" DEFAULT_MSG NODEJS_EXECUTABLE)