Mercurial > hg > orthanc-dicomweb
changeset 28:caa0bf9511bc
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 03 Jul 2015 10:46:05 +0200 |
parents | 56a4d23ab688 (diff) 1796c2dce76e (current diff) |
children | 1ffcfc3b0e24 |
files | Core/MultipartWriter.cpp Core/MultipartWriter.h Resources/CMake/GdcmConfiguration.cmake |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/GdcmConfiguration.cmake Tue Jun 30 11:58:04 2015 +0200 +++ b/Resources/CMake/GdcmConfiguration.cmake Fri Jul 03 10:46:05 2015 +0200 @@ -19,7 +19,9 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM) # If using gcc, build GDCM with the "-fPIC" argument to allow its # embedding into the shared library containing the Orthanc plugin - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") set(Flags -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC) else() set(Flags