Mercurial > hg > orthanc-wsi
changeset 22:6e84b48851f7
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 27 Oct 2016 11:44:39 +0200 |
| parents | d10ff48e47ff |
| children | 8fbe705e3d92 |
| files | Framework/Orthanc/Resources/CMake/BoostConfiguration.cmake Framework/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Framework/Orthanc/Resources/CMake/LibPngConfiguration.cmake Framework/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Framework/Orthanc/Resources/CMake/ZlibConfiguration.cmake Resources/CMake/LibTiffConfiguration.cmake |
| diffstat | 6 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Orthanc/Resources/CMake/BoostConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Framework/Orthanc/Resources/CMake/BoostConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -210,7 +210,8 @@ ${BOOST_SOURCES_DIR} ) - source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) + source_group(ThirdParty\\boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) + else() add_definitions( -DBOOST_HAS_LOCALE=1
--- a/Framework/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Framework/Orthanc/Resources/CMake/LibJpegConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -81,6 +81,8 @@ ${LIBJPEG_SOURCES_DIR}/jconfig.h COPYONLY ) + source_group(ThirdParty\\libjpeg REGULAR_EXPRESSION ${LIBJPEG_SOURCES_DIR}/.*) + else() include(FindJPEG)
--- a/Framework/Orthanc/Resources/CMake/LibPngConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Framework/Orthanc/Resources/CMake/LibPngConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -46,7 +46,7 @@ -DPNG_IMPEXP= ) - source_group(ThirdParty\\Libpng REGULAR_EXPRESSION ${LIBPNG_SOURCES_DIR}/.*) + source_group(ThirdParty\\libpng REGULAR_EXPRESSION ${LIBPNG_SOURCES_DIR}/.*) else() include(FindPNG)
--- a/Framework/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Framework/Orthanc/Resources/CMake/OpenSslConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -216,6 +216,8 @@ endif() endif() + source_group(ThirdParty\\OpenSSL REGULAR_EXPRESSION ${OPENSSL_SOURCES_DIR}/.*) + else() include(FindOpenSSL)
--- a/Framework/Orthanc/Resources/CMake/ZlibConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Framework/Orthanc/Resources/CMake/ZlibConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -27,10 +27,10 @@ ${ZLIB_SOURCES_DIR}/zutil.c ) + source_group(ThirdParty\\zlib REGULAR_EXPRESSION ${ZLIB_SOURCES_DIR}/.*) + else() include(FindZLIB) include_directories(${ZLIB_INCLUDE_DIRS}) link_libraries(${ZLIB_LIBRARIES}) endif() - -source_group(ThirdParty\\ZLib REGULAR_EXPRESSION ${ZLIB_SOURCES_DIR}/.*)
--- a/Resources/CMake/LibTiffConfiguration.cmake Thu Oct 27 11:35:43 2016 +0200 +++ b/Resources/CMake/LibTiffConfiguration.cmake Thu Oct 27 11:44:39 2016 +0200 @@ -98,7 +98,7 @@ ) endif() - source_group(ThirdParty\\LibTiff REGULAR_EXPRESSION ${LIBTIFF_SOURCES_DIR}/.*) + source_group(ThirdParty\\libtiff REGULAR_EXPRESSION ${LIBTIFF_SOURCES_DIR}/.*) else() CHECK_INCLUDE_FILE_CXX(tiff.h HAVE_LIBTIFF_H)