Mercurial > hg > orthanc

changeset 3155:077e1101d908

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix to compile postgresql plugin in FreeBSD
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Jan 2019 15:57:39 +0100
parents 6e8822be2f08
children 0c2b719c3796
files Resources/CMake/Compiler.cmake
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/Compiler.cmake	Mon Jan 21 12:09:04 2019 +0100
+++ b/Resources/CMake/Compiler.cmake	Mon Jan 21 15:57:39 2019 +0100
@@ -73,9 +73,12 @@
     ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
     ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
 
-  if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+  if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND
+      NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     # The "--no-undefined" linker flag makes the shared libraries
-    # (plugins ModalityWorklists and ServeFolders) fail to compile on OpenBSD
+    # (plugins ModalityWorklists and ServeFolders) fail to compile on
+    # OpenBSD, and make the PostgreSQL plugin complain about missing
+    # "environ" global variable in 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")
   endif()