# HG changeset patch # User Sebastien Jodogne # Date 1401703426 -7200 # Node ID 6c6e3c18799cfd9f9ea4d3312c2644d90c740705 # Parent e798ff248b985e136f2a73040e83848edb8bc1cb fix pch diff -r e798ff248b98 -r 6c6e3c18799c CMakeLists.txt --- a/CMakeLists.txt Mon Jun 02 11:50:56 2014 +0200 +++ b/CMakeLists.txt Mon Jun 02 12:03:46 2014 +0200 @@ -240,13 +240,10 @@ # Setup precompiled headers for Microsoft Visual Studio if (${MSVC}) - set(ORTHANC_SOURCES - ${ORTHANC_CORE_SOURCES} - ${ORTHANC_SERVER_SOURCES} - ${ORTHANC_UNIT_TESTS_SOURCES} - ) - ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS("PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" ORTHANC_SOURCES) - list(APPEND ORTHANC_CORE_SOURCES "Core/PrecompiledHeaders.cpp") + add_definitions(-DORTHANC_USE_PRECOMPILED_HEADERS=1) + ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS("PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" ORTHANC_CORE_SOURCES) + ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS("PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" ORTHANC_SERVER_SOURCES) + ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS("PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" ORTHANC_UNIT_TESTS_SOURCES) endif() diff -r e798ff248b98 -r 6c6e3c18799c Resources/CMake/VisualStudioPrecompiledHeaders.cmake --- a/Resources/CMake/VisualStudioPrecompiledHeaders.cmake Mon Jun 02 11:50:56 2014 +0200 +++ b/Resources/CMake/VisualStudioPrecompiledHeaders.cmake Mon Jun 02 12:03:46 2014 +0200 @@ -8,7 +8,7 @@ set_source_files_properties(${${Sources}} PROPERTIES COMPILE_FLAGS "/Yu\"${PrecompiledHeaders}\" /FI\"${PrecompiledHeaders}\" /Fp\"${PrecompiledBinary}\"" - OBJECT_DEPENDS "${PrecompiledBinary}") + OBJECT_DEPENDS "${PrecompiledBinary}") - add_definitions(-DORTHANC_USE_PRECOMPILED_HEADERS=1) + list(APPEND ${Sources} ${PrecompiledSource}) endmacro()