@@ -2,21 +2,20 @@ cmake_minimum_required(VERSION 3.10)
22
33#### NOTES:
44# * HOW TO CHANGE THE COMPILER?
5- # If you want to use specific compiler, consider using -C | --cc | --cxx cmake-js flags.
5+ # If you want to use specific compiler, consider using -C | --cc | --cxx cmake-js flags.
6+ #
67# * WINDOWS AND MINGW ISSUES?
7- # cmake-js doesn't support MinGW Makefiles -> https://github.com/cmake-js/cmake-js/issues/195
8- # /DELAYLOAD:NODE.EXE: No such file or directory -> https://github.com/cmake-js/cmake-js/issues/200
9- # cmake-js adds /DELAYLOAD:NODE.EXE + there is not an easy solution -> Move to node-gyp
10- # I've played with paths + setting the CMAKE_SHARED_LINKER_FLAGS but all that is N/A.
11- # The following does not work because CMake changes the string to be Windows path.
12- # set(CMAKE_SHARED_LINKER_FLAGS "/DELAYLOAD:/c/Program\\ Files/nodejs/node.exe")
8+ # cmake-js doesn't support MinGW Makefiles -> https://github.com/cmake-js/cmake-js/issues/195
9+ # /DELAYLOAD:NODE.EXE: No such file or directory -> https://github.com/cmake-js/cmake-js/issues/200
10+ # cmake-js adds /DELAYLOAD:NODE.EXE + there is not an easy solution.
11+ # I've played with paths + setting the CMAKE_SHARED_LINKER_FLAGS but all that is N/A.
12+ # The following does not work because CMake changes the string to be Windows path.
13+ # set(CMAKE_SHARED_LINKER_FLAGS "/DELAYLOAD:/c/Program\\ Files/nodejs/node.exe")
1314
14- project (nodemgclient VERSION 0.1.0 )
15+ project (nodemgclient VERSION 0.1.2 )
1516
1617if (WIN32 AND MINGW)
1718 message (FATAL_ERROR "ON WINDOWS BUILD UNDER MINGW NOT YET POSSIBLE" )
18- elseif (APPLE )
19- message (FATAL_ERROR "ON APPLE BUILD NOT YET POSSIBLE" )
2019endif ()
2120
2221include (ExternalProject)
@@ -36,14 +35,16 @@ add_library(project_warnings INTERFACE)
3635include (cmake/CompilerWarnings.cmake)
3736set_project_warnings(project_warnings)
3837
39- set (MGCLIENT_GIT_TAG "v1.3.0 " CACHE STRING "mgclient git tag" )
38+ set (MGCLIENT_GIT_TAG "v1.4.1 " CACHE STRING "mgclient git tag" )
4039set (MGCLIENT_LIBRARY mgclient-lib)
4140set (MGCLIENT_INSTALL_DIR ${CMAKE_BINARY_DIR} /mgclient)
4241set (MGCLIENT_INCLUDE_DIRS ${MGCLIENT_INSTALL_DIR} /include )
4342if (UNIX AND NOT APPLE )
4443 set (MGCLIENT_LIBRARY_PATH ${MGCLIENT_INSTALL_DIR} /lib/libmgclient.so)
4544elseif (WIN32 )
4645 set (MGCLIENT_LIBRARY_PATH ${MGCLIENT_INSTALL_DIR} /lib/mgclient.dll)
46+ elseif (APPLE )
47+ set (MGCLIENT_LIBRARY_PATH ${MGCLIENT_INSTALL_DIR} /lib/libmgclient.dylib)
4748endif ()
4849ExternalProject_Add(mgclient-proj
4950 PREFIX mgclient-proj
@@ -53,6 +54,7 @@ ExternalProject_Add(mgclient-proj
5354 "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} "
5455 "-DBUILD_CPP_BINDINGS=ON"
5556 "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
57+ "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} "
5658 BUILD_BYPRODUCTS "${MGCLIENT_LIBRARY_PATH} "
5759 INSTALL_DIR "${PROJECT_BINARY_DIR} /mgclient"
5860)
0 commit comments