Skip to content

Commit

Permalink
Stop explictly adding /DCPPREST_FORCE_PPLX=1 so that we can actually …
Browse files Browse the repository at this point in the history
…build nmos-cpp at least for testing even when cpprest DLL was built without CPPREST_PPLX_IMPL = winpplx

(cherry picked from commit b0b08b01eec573023633d6621490338723845494)
  • Loading branch information
garethsb committed Dec 4, 2017
1 parent b2e6093 commit cf9fa3f
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Development/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
# https://stackoverflow.com/questions/9742003/platform-detection-in-cmake
add_definitions(/D_WIN32_WINNT=0x0600)

# force cpprestsdk to use pplx (for nmos-cpp-node and nmos-cpp-registry)
# note: don't actually need this since target_link_libraries(cpprestsdk::cpprest) does this if it's been configured correctly
add_definitions(/DCPPREST_FORCE_PPLX=1)

# does one of our dependencies result in needing to do this?
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt")
endif()
Expand Down

0 comments on commit cf9fa3f

Please sign in to comment.