Mercurial > hg > orthanc-wsi
changeset 118:3ddaaad18ec0
fix msvc precompiled headers
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 04 Jan 2018 11:28:56 +0100 |
| parents | 28bd1b119c4d |
| children | bf430fee14d1 |
| files | Applications/CMakeLists.txt ViewerPlugin/CMakeLists.txt |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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}
--- 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}