mirror of
https://github.com/eclipse/upm.git
synced 2025-03-15 04:57:30 +03:00
cmake: changes for nodejs 4.1.1 - resubmit
Signed-off-by: Eugene Bolshakov <pub@relvarsoft.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
parent
011013e800
commit
1adea8ecf1
@ -5,7 +5,7 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
|
|||||||
message("WARNING: building into sources dir can be risky, prefer other directory")
|
message("WARNING: building into sources dir can be risky, prefer other directory")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
find_package (SWIG)
|
find_package (SWIG 3.0.5)
|
||||||
if (SWIG_FOUND)
|
if (SWIG_FOUND)
|
||||||
include (${SWIG_USE_FILE})
|
include (${SWIG_USE_FILE})
|
||||||
endif ()
|
endif ()
|
||||||
@ -28,7 +28,7 @@ include(GNUInstallDirs)
|
|||||||
# Make a version file containing the current version from git.
|
# Make a version file containing the current version from git.
|
||||||
include (GetGitRevisionDescription)
|
include (GetGitRevisionDescription)
|
||||||
git_describe (VERSION "--tags")
|
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!")
|
message (WARNING " - Install git to compile a production UPM!")
|
||||||
set (VERSION "v0.4.0-dirty")
|
set (VERSION "v0.4.0-dirty")
|
||||||
endif ()
|
endif ()
|
||||||
|
@ -47,6 +47,15 @@ macro(upm_SWIG_NODE)
|
|||||||
PREFIX ""
|
PREFIX ""
|
||||||
SUFFIX ".node"
|
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})
|
createpackagejson(${libname})
|
||||||
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}.node
|
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}.node
|
||||||
DESTINATION lib/node_modules/jsupm_${libname} COMPONENT ${libname})
|
DESTINATION lib/node_modules/jsupm_${libname} COMPONENT ${libname})
|
||||||
@ -86,11 +95,11 @@ macro(upm_SWIG_JAVA)
|
|||||||
)
|
)
|
||||||
|
|
||||||
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
|
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
|
||||||
set (JAVAC $ENV{JAVA_HOME}/bin/javac)
|
set (JAVAC $ENV{JAVA_HOME}/bin/javac)
|
||||||
set (JAR $ENV{JAVA_HOME}/bin/jar)
|
set (JAR $ENV{JAVA_HOME}/bin/jar)
|
||||||
else ()
|
else ()
|
||||||
set (JAVAC $ENV{JAVA_HOME_NATIVE}/bin/javac)
|
set (JAVAC $ENV{JAVA_HOME_NATIVE}/bin/javac)
|
||||||
set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar)
|
set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_custom_command (TARGET javaupm_${libname}
|
add_custom_command (TARGET javaupm_${libname}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user