changeset 156:b4c17acb5dca

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Jan 2018 17:39:08 +0100 (2018-01-04)
parents 591bfe198944
children cd83eec51b62
files Orthanc/Core/Endianness.h Orthanc/Resources/CMake/Compiler.cmake
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Orthanc/Core/Endianness.h	Thu Jan 04 09:49:38 2018 +0100
+++ b/Orthanc/Core/Endianness.h	Thu Jan 04 17:39:08 2018 +0100
@@ -101,6 +101,16 @@
 
 
 /********************************************************************
+ ** OPENBSD ARCHITECTURES
+ ********************************************************************/
+
+#if defined(__OpenBSD__)
+#  define ORTHANC_HAS_BUILTIN_BYTE_SWAP 1
+#  include <endian.h>
+#endif
+
+
+/********************************************************************
  ** APPLE ARCHITECTURES (including OS X)
  ********************************************************************/
 
--- a/Orthanc/Resources/CMake/Compiler.cmake	Thu Jan 04 09:49:38 2018 +0100
+++ b/Orthanc/Resources/CMake/Compiler.cmake	Thu Jan 04 17:39:08 2018 +0100
@@ -99,8 +99,9 @@
     link_libraries(dl)
   endif()
 
-  if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-    # The "--as-needed" linker flag is not available on FreeBSD
+  if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND
+      NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+    # The "--as-needed" linker flag is not available on FreeBSD and OpenBSD
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")