# HG changeset patch # User Sebastien Jodogne # Date 1515061736 -3600 # Node ID 3ddaaad18ec0c53852a21f5de334b03035552bda # Parent 28bd1b119c4d243e171a7b7eb9e896da93a7788d fix msvc precompiled headers diff -r 28bd1b119c4d -r 3ddaaad18ec0 Applications/CMakeLists.txt --- a/Applications/CMakeLists.txt Thu Jan 04 10:55:12 2018 +0100 +++ b/Applications/CMakeLists.txt Thu Jan 04 11:28:56 2018 +0100 @@ -233,10 +233,12 @@ add_definitions(-DORTHANC_USE_PRECOMPILED_HEADERS=1) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeaders.h" "${ORTHANC_WSI_DIR}/Resources/Orthanc/Core/PrecompiledHeaders.cpp" ORTHANC_CORE_SOURCES) + "PrecompiledHeaders.h" "${ORTHANC_WSI_DIR}/Resources/Orthanc/Core/PrecompiledHeaders.cpp" + ORTHANC_CORE_SOURCES ORTHANC_CORE_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" ORTHANC_WSI_SOURCES) + "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" + ORTHANC_WSI_SOURCES ORTHANC_WSI_PCH) source_group(ThirdParty\\OrthancCore FILES ${ORTHANC_CORE_SOURCES}) endif() @@ -247,7 +249,9 @@ ##################################################################### add_library(OrthancWSIFramework STATIC + ${ORTHANC_CORE_PCH} ${ORTHANC_CORE_SOURCES} + ${ORTHANC_WSI_PCH} ${ORTHANC_WSI_SOURCES} ${AUTOGENERATED_SOURCES} diff -r 28bd1b119c4d -r 3ddaaad18ec0 ViewerPlugin/CMakeLists.txt --- a/ViewerPlugin/CMakeLists.txt Thu Jan 04 10:55:12 2018 +0100 +++ b/ViewerPlugin/CMakeLists.txt Thu Jan 04 11:28:56 2018 +0100 @@ -214,10 +214,12 @@ add_definitions(-DORTHANC_USE_PRECOMPILED_HEADERS=1) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeaders.h" "${ORTHANC_WSI_DIR}/Resources/Orthanc/Core/PrecompiledHeaders.cpp" ORTHANC_CORE_SOURCES) + "PrecompiledHeaders.h" "${ORTHANC_WSI_DIR}/Resources/Orthanc/Core/PrecompiledHeaders.cpp" + ORTHANC_CORE_SOURCES ORTHANC_CORE_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" ORTHANC_WSI_SOURCES) + "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" + ORTHANC_WSI_SOURCES ORTHANC_WSI_PCH) source_group(ThirdParty\\OrthancCore FILES ${ORTHANC_CORE_SOURCES}) endif() @@ -228,10 +230,12 @@ ##################################################################### add_library(OrthancWSI SHARED + ${ORTHANC_CORE_PCH} ${ORTHANC_CORE_SOURCES} + ${ORTHANC_WSI_PCH} ${ORTHANC_WSI_SOURCES} ${AUTOGENERATED_SOURCES} - + # Mandatory components ${BOOST_SOURCES} ${JSONCPP_SOURCES}