From 1adea8ecf15861885511c6075234a2b2aba67355 Mon Sep 17 00:00:00 2001 From: Eugene Bolshakov Date: Tue, 24 Nov 2015 02:50:17 +0300 Subject: [PATCH] cmake: changes for nodejs 4.1.1 - resubmit Signed-off-by: Eugene Bolshakov Signed-off-by: Mihai Tudor Panu --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92ec96e9..7b58d8d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message("WARNING: building into sources dir can be risky, prefer other directory") endif () -find_package (SWIG) +find_package (SWIG 3.0.5) if (SWIG_FOUND) include (${SWIG_USE_FILE}) endif () @@ -28,7 +28,7 @@ include(GNUInstallDirs) # Make a version file containing the current version from git. include (GetGitRevisionDescription) git_describe (VERSION "--tags") -if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND") +if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND") message (WARNING " - Install git to compile a production UPM!") set (VERSION "v0.4.0-dirty") endif () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48e612bf..8c26ede4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,6 +47,15 @@ macro(upm_SWIG_NODE) PREFIX "" SUFFIX ".node" ) + if (${V8_VERSION_MAJOR} GREATER 3) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") + message(FATAL_ERROR " **ERROR** GCC 4.7 or above is required to compile jsupm_${libname} ") + endif() + endif() + set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD 11) + set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD_REQUIRED ON) + endif() createpackagejson(${libname}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}.node DESTINATION lib/node_modules/jsupm_${libname} COMPONENT ${libname}) @@ -86,11 +95,11 @@ macro(upm_SWIG_JAVA) ) if (NOT DEFINED $ENV{JAVA_HOME_NATIVE}) - set (JAVAC $ENV{JAVA_HOME}/bin/javac) - set (JAR $ENV{JAVA_HOME}/bin/jar) + set (JAVAC $ENV{JAVA_HOME}/bin/javac) + set (JAR $ENV{JAVA_HOME}/bin/jar) else () - set (JAVAC $ENV{JAVA_HOME_NATIVE}/bin/javac) - set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar) + set (JAVAC $ENV{JAVA_HOME_NATIVE}/bin/javac) + set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar) endif () add_custom_command (TARGET javaupm_${libname}