Mercurial > hg > orthanc-postgresql
changeset 63:c5348f5432d0
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 25 Sep 2015 12:50:10 +0200 |
| parents | 79aa827f3dfc |
| children | f91f04d6430e |
| files | CMakeLists.txt Orthanc/Resources/CMake/Compiler.cmake |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Sep 18 17:46:46 2015 +0200 +++ b/CMakeLists.txt Fri Sep 25 12:50:10 2015 +0200 @@ -100,10 +100,6 @@ set(STORAGE_RESOURCES ${AUTOGENERATED_DIR}/StorageVersion.rc) endif() -if (CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/Orthanc/Plugins/Samples/Common/VersionScript.map -Wl,--no-undefined") -endif() - # Embed the SQL files into the binaries
--- a/Orthanc/Resources/CMake/Compiler.cmake Fri Sep 18 17:46:46 2015 +0200 +++ b/Orthanc/Resources/CMake/Compiler.cmake Fri Sep 25 12:50:10 2015 +0200 @@ -50,7 +50,7 @@ ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--version-script=${ORTHANC_ROOT}/Plugins/Samples/Common/VersionScript.map") # Remove the "-rdynamic" option # http://www.mail-archive.com/cmake@cmake.org/msg08837.html @@ -108,6 +108,8 @@ endif() elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -exported_symbols_list ${ORTHANC_ROOT}/Plugins/Samples/Common/ExportedSymbols.list") + add_definitions( -D_XOPEN_SOURCE=1 )