Mercurial > hg > orthanc
changeset 917:312d04beb0a2 mac
branch for mac os build
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 24 Feb 2014 15:10:30 +0100 |
parents | 948720c72586 |
children | ac8f68cbdbb6 |
files | CMakeLists.txt Resources/CMake/BoostConfiguration.cmake Resources/CMake/GoogleLogConfiguration.cmake |
diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Feb 24 13:50:40 2014 +0100 +++ b/CMakeLists.txt Mon Feb 24 15:10:30 2014 +0100 @@ -348,6 +348,10 @@ ) endif() + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + # TODO + target_link_libraries(OrthancClient pthread) + else() message(FATAL_ERROR "Support your platform here") endif()
--- a/Resources/CMake/BoostConfiguration.cmake Mon Feb 24 13:50:40 2014 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Mon Feb 24 15:10:30 2014 +0100 @@ -53,7 +53,8 @@ ) set(BOOST_SOURCES) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") list(APPEND BOOST_SOURCES ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp
--- a/Resources/CMake/GoogleLogConfiguration.cmake Mon Feb 24 13:50:40 2014 +0100 +++ b/Resources/CMake/GoogleLogConfiguration.cmake Mon Feb 24 15:10:30 2014 +0100 @@ -28,7 +28,8 @@ set(ac_google_start_namespace "namespace google {") set(ac_google_end_namespace "}") - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") set(ac_cv_have_unistd_h 1) set(ac_cv_have_stdint_h 1) set(ac_cv_have_systypes_h 0) @@ -83,7 +84,8 @@ ) endif() - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") # Install the specific configuration for LSB SDK configure_file(