Fixup static Win32 builds

garethsb · Nov 5, 2017 · a24b81a · a24b81a
1 parent b063472
commit a24b81a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -192,7 +192,7 @@ if(WIN32)
   if (BUILD_SHARED_LIBS)
     target_compile_definitions(cpprest PRIVATE -D_ASYNCRT_EXPORT -D_PPLX_EXPORT -D_USRDLL)
   else()
-    target_compile_definitions(cpprest INTERFACE -D_NO_ASYNCRTIMP -D_NO_PPLXIMP)
+    target_compile_definitions(cpprest PUBLIC -D_NO_ASYNCRTIMP -D_NO_PPLXIMP)
   endif()
 elseif(ANDROID)
   target_link_libraries(cpprest PRIVATE ${ANDROID_STL_FLAGS})

diff --git a/Release/tests/functional/streams/CMakeLists.txt b/Release/tests/functional/streams/CMakeLists.txt
@@ -18,5 +18,9 @@ endif()
 add_casablanca_test(streams_test SOURCES)
 if(NOT WIN32 OR CPPREST_WEBSOCKETS_IMPL STREQUAL "wspp")
   cpprest_find_boost()
-  target_link_libraries(streams_test PRIVATE cpprestsdk_boost_internal)
+  if(NOT TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+    target_link_libraries(streams_test PRIVATE cpprestsdk_boost_internal)
+  else()
+    target_include_directories(streams_test PRIVATE $<TARGET_PROPERTY:cpprestsdk_boost_internal,INTERFACE_INCLUDE_DIRECTORIES>)
+  endif()
 endif()