Mercurial > hg > orthanc
changeset 2113:0108ac01fc8e
added source_group directives for MSVC
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 27 Oct 2016 11:43:28 +0200 |
| parents | 82461d1e8e17 |
| children | e4f8e377782f |
| files | Resources/CMake/BoostConfiguration.cmake Resources/CMake/GoogleTestConfiguration.cmake Resources/CMake/LibIconvConfiguration.cmake Resources/CMake/LibJpegConfiguration.cmake Resources/CMake/LibP11Configuration.cmake Resources/CMake/LibPngConfiguration.cmake Resources/CMake/OpenSslConfiguration.cmake Resources/CMake/PugixmlConfiguration.cmake Resources/CMake/ZlibConfiguration.cmake |
| diffstat | 9 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Thu Oct 27 11:43:28 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/Resources/CMake/GoogleTestConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/GoogleTestConfiguration.cmake Thu Oct 27 11:43:28 2016 +0200 @@ -28,6 +28,8 @@ add_definitions(/D _VARIADIC_MAX=10) endif() + source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION ${GTEST_SOURCES_DIR}/.*) + else() include(FindGTest) if (NOT GTEST_FOUND)
--- a/Resources/CMake/LibIconvConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/LibIconvConfiguration.cmake Thu Oct 27 11:43:28 2016 +0200 @@ -48,3 +48,5 @@ ${LIBICONV_SOURCES_DIR}/libcharset/lib/localcharset.c ${LIBICONV_SOURCES_DIR}/libcharset/lib/relocatable.c ) + +source_group(ThirdParty\\libiconv REGULAR_EXPRESSION ${LIBICONV_SOURCES_DIR}/.*)
--- a/Resources/CMake/LibJpegConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/LibJpegConfiguration.cmake Thu Oct 27 11:43:28 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/Resources/CMake/LibP11Configuration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/LibP11Configuration.cmake Thu Oct 27 11:43:28 2016 +0200 @@ -54,6 +54,8 @@ ) endif() + source_group(ThirdParty\\libp11 REGULAR_EXPRESSION ${LIBP11_SOURCES_DIR}/.*) + else() check_include_file_cxx(libp11.h HAVE_LIBP11_H) if (NOT HAVE_LIBP11_H)
--- a/Resources/CMake/LibPngConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/LibPngConfiguration.cmake Thu Oct 27 11:43:28 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/Resources/CMake/OpenSslConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/OpenSslConfiguration.cmake Thu Oct 27 11:43:28 2016 +0200 @@ -216,6 +216,8 @@ endif() endif() + source_group(ThirdParty\\OpenSSL REGULAR_EXPRESSION ${OPENSSL_SOURCES_DIR}/.*) + else() include(FindOpenSSL)
--- a/Resources/CMake/PugixmlConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/PugixmlConfiguration.cmake Thu Oct 27 11:43:28 2016 +0200 @@ -26,6 +26,8 @@ link_libraries(pugixml) endif() + source_group(ThirdParty\\pugixml REGULAR_EXPRESSION ${PUGIXML_SOURCES_DIR}/.*) + else() add_definitions(-DORTHANC_PUGIXML_ENABLED=0) endif()
--- a/Resources/CMake/ZlibConfiguration.cmake Thu Oct 27 11:32:38 2016 +0200 +++ b/Resources/CMake/ZlibConfiguration.cmake Thu Oct 27 11:43:28 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}/.*)