Mercurial > hg > orthanc-stone
changeset 28:a75bb9af7384
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 29 Nov 2016 13:28:06 +0100 |
| parents | 507b5776ebad |
| children | 22ab2d8566fa |
| files | Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Resources/Orthanc/Resources/CMake/Compiler.cmake Resources/Orthanc/Resources/CMake/GoogleTestConfiguration.cmake Resources/Orthanc/Resources/CMake/JsonCppConfiguration.cmake Resources/Orthanc/Resources/CMake/LibCurlConfiguration.cmake Resources/Orthanc/Resources/CMake/LibIconvConfiguration.cmake Resources/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Resources/Orthanc/Resources/CMake/LibPngConfiguration.cmake Resources/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Resources/Orthanc/Resources/CMake/ZlibConfiguration.cmake Resources/Orthanc/Resources/EmbedResources.py |
| diffstat | 11 files changed, 30 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -43,7 +43,7 @@ set(BOOST_NAME boost_1_60_0) set(BOOST_BCP_SUFFIX bcpdigest-1.0.1) set(BOOST_MD5 "a789f8ec2056ad1c2d5f0cb64687cc7b") - set(BOOST_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") + set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
--- a/Resources/Orthanc/Resources/CMake/Compiler.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/Compiler.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -164,6 +164,23 @@ endif() +if (DEFINED ENABLE_PROFILING AND ENABLE_PROFILING) + if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + message(WARNING "Enabling profiling on a non-debug build will not produce full information") + endif() + + if (CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pg") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg") + else() + message(FATAL_ERROR "Don't know how to enable profiling on your configuration") + endif() +endif() + + if (STATIC_BUILD) add_definitions(-DORTHANC_STATIC=1) else()
--- a/Resources/Orthanc/Resources/CMake/GoogleTestConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/GoogleTestConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -26,7 +26,7 @@ elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0) - set(GTEST_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.7.0.zip") + set(GTEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip") set(GTEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7") DownloadPackage(${GTEST_MD5} ${GTEST_URL} "${GTEST_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/JsonCppConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/JsonCppConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP) set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.5) - set(JSONCPP_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-0.10.5.tar.gz") + set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.5.tar.gz") set(JSONCPP_MD5 "db146bac5a126ded9bd728ab7b61ed6b") DownloadPackage(${JSONCPP_MD5} ${JSONCPP_URL} "${JSONCPP_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/LibCurlConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/LibCurlConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.50.3) - SET(CURL_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.50.3.tar.gz") + SET(CURL_URL "http://www.orthanc-server.com/downloads/third-party/curl-7.50.3.tar.gz") SET(CURL_MD5 "870e16fd88a88b52e26a4f04dfc161db") DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/LibIconvConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/LibIconvConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -1,5 +1,5 @@ set(LIBICONV_SOURCES_DIR ${CMAKE_BINARY_DIR}/libiconv-1.14) -set(LIBICONV_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libiconv-1.14.tar.gz") +set(LIBICONV_URL "http://www.orthanc-server.com/downloads/third-party/libiconv-1.14.tar.gz") set(LIBICONV_MD5 "e34509b1623cec449dfeb73d7ce9c6c6") DownloadPackage(${LIBICONV_MD5} ${LIBICONV_URL} "${LIBICONV_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -2,7 +2,7 @@ set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9a) DownloadPackage( "3353992aecaee1805ef4109aadd433e7" - "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jpegsrc.v9a.tar.gz" + "http://www.orthanc-server.com/downloads/third-party/jpegsrc.v9a.tar.gz" "${LIBJPEG_SOURCES_DIR}") include_directories(
--- a/Resources/Orthanc/Resources/CMake/LibPngConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/LibPngConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG) SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12) - SET(LIBPNG_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz") + SET(LIBPNG_URL "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz") SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28") DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -4,7 +4,7 @@ # not always properly handled when uncompressing on Windows. SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2d) - SET(OPENSSL_URL "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.2d.zip") + SET(OPENSSL_URL "http://www.orthanc-server.com/downloads/third-party/openssl-1.0.2d.zip") SET(OPENSSL_MD5 "4b2ac15fc6db17f3dadc54482d3eee85") if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/CMake/ZlibConfiguration.cmake Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/CMake/ZlibConfiguration.cmake Tue Nov 29 13:28:06 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB) SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7) - SET(ZLIB_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/zlib-1.2.7.tar.gz") + SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz") SET(ZLIB_MD5 "60df6a37c56e7c1366cca812414f7b85") DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")
--- a/Resources/Orthanc/Resources/EmbedResources.py Wed Nov 23 17:10:38 2016 +0100 +++ b/Resources/Orthanc/Resources/EmbedResources.py Tue Nov 29 13:28:06 2016 +0100 @@ -159,6 +159,10 @@ #include <string> #include <list> +#if defined(_MSC_VER) +# pragma warning(disable: 4065) // "Switch statement contains 'default' but no 'case' labels" +#endif + namespace %s { namespace EmbeddedResources