Mercurial > hg > orthanc
diff CMakeLists.txt @ 2391:233d6eeef799
fix pch
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 30 Aug 2017 12:29:48 +0200 |
parents | cf0eb76c5e81 |
children | a88c3ea0c96d |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Aug 30 12:05:49 2017 +0200 +++ b/CMakeLists.txt Wed Aug 30 12:29:48 2017 +0200 @@ -59,8 +59,6 @@ ##################################################################### set(ORTHANC_SERVER_SOURCES - ${ORTHANC_DICOM_SOURCES} - OrthancServer/DatabaseWrapper.cpp OrthancServer/DatabaseWrapperBase.cpp OrthancServer/DicomInstanceToStore.cpp @@ -147,6 +145,7 @@ # cross-compiling DCMTK 3.6.0 set(ORTHANC_ALL_SOURCES ${ORTHANC_CORE_SOURCES_INTERNAL} + ${ORTHANC_DICOM_SOURCES_INTERNAL} ${ORTHANC_SERVER_SOURCES} ${ORTHANC_UNIT_TESTS_SOURCES} Plugins/Samples/ServeFolders/Plugin.cpp @@ -249,14 +248,22 @@ if (MSVC) add_definitions(-DORTHANC_USE_PRECOMPILED_HEADERS=1) + set(TMP + ${ORTHANC_CORE_SOURCES_INTERNAL} + ${ORTHANC_DICOM_SOURCES_INTERNAL} + ) + ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" ORTHANC_CORE_SOURCES_INTERNAL) + "PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" + TMP ORTHANC_CORE_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeadersServer.h" "OrthancServer/PrecompiledHeadersServer.cpp" ORTHANC_SERVER_SOURCES) + "PrecompiledHeadersServer.h" "OrthancServer/PrecompiledHeadersServer.cpp" + ORTHANC_SERVER_SOURCES ORTHANC_SERVER_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeadersUnitTests.h" "UnitTestsSources/PrecompiledHeadersUnitTests.cpp" ORTHANC_UNIT_TESTS_SOURCES) + "PrecompiledHeadersUnitTests.h" "UnitTestsSources/PrecompiledHeadersUnitTests.cpp" + ORTHANC_UNIT_TESTS_SOURCES ORTHANC_UNIT_TESTS_PCH) endif() @@ -275,8 +282,8 @@ # content of the "Core" folder, but not OpenSSL, nor DCMTK. add_library(CoreLibrary STATIC - ${ORTHANC_CORE_SOURCES_INTERNAL} - ${ORTHANC_CORE_SOURCES_DEPENDENCIES} + ${ORTHANC_CORE_PCH} + ${ORTHANC_CORE_SOURCES} ${AUTOGENERATED_SOURCES} ) @@ -288,8 +295,9 @@ # "ServerLibrary" contains DCMTK add_library(ServerLibrary STATIC - ${DCMTK_SOURCES} + ${ORTHANC_SERVER_PCH} ${ORTHANC_SERVER_SOURCES} + ${ORTHANC_DICOM_SOURCES} ) # Ensure autogenerated code is built before building ServerLibrary @@ -319,6 +327,7 @@ add_executable(UnitTests ${GTEST_SOURCES} + ${ORTHANC_UNIT_TESTS_PCH} ${ORTHANC_UNIT_TESTS_SOURCES} )