cmake.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 70d88c3..c560abf 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -15,7 +15,7 @@ else ()
  6. endif ()
  7. # Some builds need position-independent code.
  8. -set (CMAKE_POSITION_INDEPENDENT_CODE ON)
  9. +
  10. # Allow nsync users to turn the tests on or off.
  11. option (NSYNC_ENABLE_TESTS "Enable for building tests" ON)
  12. @@ -90,7 +90,9 @@ endif ()
  13. # Pick the include directory for the operating system.
  14. if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX")
  15. include_directories ("${PROJECT_SOURCE_DIR}/platform/win32")
  16. - set (NSYNC_CPP_FLAGS "/TP")
  17. + if (MSVC)
  18. + set (NSYNC_CPP_FLAGS "/TP")
  19. + endif ()
  20. set (NSYNC_OS_SRC
  21. ${NSYNC_POSIX_SRC}
  22. @@ -397,15 +399,17 @@ if (NSYNC_ENABLE_TESTS)
  23. endforeach (t)
  24. endif ()
  25. -set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
  26. +
  27. install (TARGETS nsync EXPORT nsync
  28. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
  29. - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
  30. + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
  31. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  32. install (TARGETS nsync_cpp EXPORT nsync_cpp OPTIONAL
  33. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
  34. - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
  35. + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
  36. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  37. set (NSYNC_INCLUDES
  38. "public/nsync.h"