Mercurial > hg > orthanc

comparison Resources/CMake/Compiler.cmake @ 3160:fc9a4a2dad63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Thu, 24 Jan 2019 10:55:19 +0100
parents 077e1101d908
children ae68bf751187
comparison
equal deleted inserted replaced
3159:4cfed5c2eacd 3160:fc9a4a2dad63
71 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 71 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
72 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR 72 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
73 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR 73 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
74 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") 74 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
75 75
76 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") 76 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND
77 NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
77 # The "--no-undefined" linker flag makes the shared libraries 78 # The "--no-undefined" linker flag makes the shared libraries
78 # (plugins ModalityWorklists and ServeFolders) fail to compile on OpenBSD 79 # (plugins ModalityWorklists and ServeFolders) fail to compile on
80 # OpenBSD, and make the PostgreSQL plugin complain about missing
81 # "environ" global variable in FreeBSD
79 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined") 82 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
80 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") 83 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
81 endif() 84 endif()
82 85
83 if (NOT DEFINED ENABLE_PLUGINS_VERSION_SCRIPT OR 86 if (NOT DEFINED ENABLE_PLUGINS_VERSION_SCRIPT OR