Skip to content

Commit

Permalink
Revert "Enable precompiled headers for test/functional (#891)" (#904)
Browse files Browse the repository at this point in the history
This reverts commit 2aa4a64 because it fails
to compile:

D:\cpprestsdk\build.debug>ninja
ninja: error: dependency cycle: Release/tests/functional/http/client/stdafx.pch -> Release/tests/functional/http/client/CMakeFiles/httpclient_test.dir/stdafx.cpp.obj -> Release/tests/functional/http/client/stdafx.pch
  • Loading branch information
BillyONeal authored Oct 11, 2018
1 parent 5a9f3bc commit 8484f5d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 78 deletions.
13 changes: 0 additions & 13 deletions Release/tests/functional/http/client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,6 @@ else()
target_link_libraries(httpclient_test PRIVATE httptest_utilities)
endif()

if(MSVC)
get_target_property(_srcs httpclient_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(httpclient_test PRIVATE stdafx.cpp)
target_compile_options(httpclient_test PRIVATE /Yustdafx.h /Zm200)
endif()

if(NOT WIN32)
cpprest_find_boost()
target_link_libraries(httpclient_test PRIVATE cpprestsdk_boost_internal)
Expand Down
13 changes: 0 additions & 13 deletions Release/tests/functional/json/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,3 @@ if(UNIX AND NOT APPLE)
cpprest_find_boost()
target_link_libraries(json_test PRIVATE cpprestsdk_boost_internal)
endif()

if(MSVC)
get_target_property(_srcs json_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(json_test PRIVATE stdafx.cpp)
target_compile_options(json_test PRIVATE /Yustdafx.h /Zm200)
endif()
13 changes: 0 additions & 13 deletions Release/tests/functional/pplx/pplx_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,3 @@ set(SOURCES
)

add_casablanca_test(pplx_test SOURCES)

if(MSVC)
get_target_property(_srcs pplx_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(pplx_test PRIVATE stdafx.cpp)
target_compile_options(pplx_test PRIVATE /Yustdafx.h /Zm200)
endif()
13 changes: 0 additions & 13 deletions Release/tests/functional/streams/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,3 @@ if(NOT WIN32 OR CPPREST_WEBSOCKETS_IMPL STREQUAL "wspp")
target_include_directories(streams_test PRIVATE $<TARGET_PROPERTY:cpprestsdk_boost_internal,INTERFACE_INCLUDE_DIRECTORIES>)
endif()
endif()

if(MSVC)
get_target_property(_srcs streams_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(streams_test PRIVATE stdafx.cpp)
target_compile_options(streams_test PRIVATE /Yustdafx.h /Zm200)
endif()
13 changes: 0 additions & 13 deletions Release/tests/functional/uri/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,3 @@ set(SOURCES
)

add_casablanca_test(uri_test SOURCES)

if(MSVC)
get_target_property(_srcs uri_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(uri_test PRIVATE stdafx.cpp)
target_compile_options(uri_test PRIVATE /Yustdafx.h /Zm200)
endif()
13 changes: 0 additions & 13 deletions Release/tests/functional/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,3 @@ add_casablanca_test(utils_test SOURCES)
if(CMAKE_COMPILER_IS_GNUCXX)
target_compile_options(utils_test PRIVATE "-Wno-deprecated-declarations")
endif()

if(MSVC)
get_target_property(_srcs utils_test SOURCES)

if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
endif()

set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
target_sources(utils_test PRIVATE stdafx.cpp)
target_compile_options(utils_test PRIVATE /Yustdafx.h /Zm200)
endif()

0 comments on commit 8484f5d

Please sign in to comment.