Mercurial > hg > orthanc
changeset 4971:d68b3a2cea17 more-tags
merge default -> more tags
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 30 Mar 2022 15:45:54 +0200 |
| parents | f78438f61847 (current diff) 2e3006382c22 (diff) |
| children | 03632ed1eb67 |
| files | OrthancServer/CMakeLists.txt |
| diffstat | 4 files changed, 47 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake Wed Mar 23 18:04:40 2022 +0100 +++ b/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake Wed Mar 30 15:45:54 2022 +0200 @@ -59,6 +59,8 @@ -DPNG_NO_CONFIG_H=1 -DPNG_NO_CONSOLE_IO=1 -DPNG_NO_STDIO=1 + # disable ARM neon optimization for Apple M1 builds (TODO: try adding arm/filter_neon_intrinscis.c ... ) + -DPNG_ARM_NEON_OPT=0 # The following declaration avoids "__declspec(dllexport)" in # libpng to prevent publicly exposing its symbols by the DLLs -DPNG_IMPEXP=
--- a/OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch Wed Mar 23 18:04:40 2022 +0100 +++ b/OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch Wed Mar 30 15:45:54 2022 +0200 @@ -150,3 +150,34 @@ this->setvbuf(NULL, _IOLBF, 0); #else :: setlinebuf(file_); + +diff -urEb dcmtk-3.6.6.orig/config/tests/arith.cc dcmtk-3.6.6/config/tests/arith.cc +--- dcmtk-3.6.6.orig/config/tests/arith.cc 2022-03-28 19:17:03.000000000 +0000 ++++ dcmtk-3.6.6/config/tests/arith.cc 2022-03-28 19:18:12.000000000 +0000 +@@ -40,7 +40,7 @@ + #include <ieeefp.h> + #endif + +-#ifdef __APPLE__ ++#if defined(__APPLE__) && !defined(__aarch64__) + // For controlling floating point exceptions on OS X. + #include <xmmintrin.h> + #endif +@@ -340,7 +340,7 @@ + #ifdef HAVE_WINDOWS_H + _clearfp(); + _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM ); +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) && !defined(__aarch64__) + _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID ); + #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) + feenableexcept( FE_INVALID ); +@@ -382,7 +382,7 @@ + _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM ); + #elif defined(HAVE_FENV_H) + feclearexcept( FE_INVALID ); +-#ifdef __APPLE__ ++#if defined(__APPLE__) && !defined(__aarch64__) + _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID ); + #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) + fedisableexcept( FE_INVALID );
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt Wed Mar 23 18:04:40 2022 +0100 +++ b/OrthancFramework/SharedLibrary/CMakeLists.txt Wed Mar 30 15:45:54 2022 +0200 @@ -526,6 +526,13 @@ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=${UNIT_TESTS_WITH_HTTP_CONNEXIONS} -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=${USE_GOOGLE_TEST_DEBIAN_PACKAGE} -DUSE_SYSTEM_GOOGLE_TEST:BOOL=${USE_SYSTEM_GOOGLE_TEST} + + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} + -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} ) add_dependencies(UnitTests OrthancFramework)
--- a/OrthancServer/CMakeLists.txt Wed Mar 23 18:04:40 2022 +0100 +++ b/OrthancServer/CMakeLists.txt Wed Mar 30 15:45:54 2022 +0200 @@ -575,6 +575,13 @@ -DUSE_SYSTEM_BOOST=${USE_SYSTEM_BOOST} -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP} ${Flags} + + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} + -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} ) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")