|
@@ -0,0 +1,48 @@
|
|
|
+diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
+index 827ca29..cfd1b9c 100644
|
|
|
+--- a/CMakeLists.txt
|
|
|
++++ b/CMakeLists.txt
|
|
|
+@@ -15,7 +15,7 @@ else ()
|
|
|
+ endif ()
|
|
|
+
|
|
|
+ # Some builds need position-independent code.
|
|
|
+-set (CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
|
++
|
|
|
+
|
|
|
+ # Allow nsync users to turn the tests on or off.
|
|
|
+ option (NSYNC_ENABLE_TESTS "Enable for building tests" ON)
|
|
|
+@@ -90,7 +90,9 @@ endif ()
|
|
|
+ # Pick the include directory for the operating system.
|
|
|
+ if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX")
|
|
|
+ include_directories ("${PROJECT_SOURCE_DIR}/platform/win32")
|
|
|
+- set (NSYNC_CPP_FLAGS "/TP")
|
|
|
++ if (MSVC)
|
|
|
++ set (NSYNC_CPP_FLAGS "/TP")
|
|
|
++ endif()
|
|
|
+
|
|
|
+ set (NSYNC_OS_SRC
|
|
|
+ ${NSYNC_POSIX_SRC}
|
|
|
+@@ -125,7 +127,6 @@ elseif ("${CMAKE_SYSTEM_NAME}X" STREQUAL "DarwinX")
|
|
|
+ ${NSYNC_OS_CPP_SRC}
|
|
|
+ "platform/c++11/src/nsync_semaphore_mutex.cc"
|
|
|
+ "platform/posix/src/clock_gettime.c"
|
|
|
+- "platform/posix/src/nsync_semaphore_mutex.c"
|
|
|
+ )
|
|
|
+ elseif ("${CMAKE_SYSTEM_NAME}X" STREQUAL "LinuxX")
|
|
|
+ set (NSYNC_POSIX ON)
|
|
|
+@@ -402,11 +403,13 @@ set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
|
|
|
+
|
|
|
+ install (TARGETS nsync EXPORT nsync
|
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
|
|
|
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
|
|
|
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
|
|
|
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
+
|
|
|
+ install (TARGETS nsync_cpp EXPORT nsync_cpp OPTIONAL
|
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
|
|
|
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
|
|
|
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
|
|
|
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
+
|
|
|
+ set (NSYNC_INCLUDES
|
|
|
+ "public/nsync.h"
|