Fixing linker problems when HPX is built using vcpkg

STEllAR-GROUP · Jun 1, 2017 · ec0c6ef · ec0c6ef
1 parent 6ae2418
commit ec0c6ef
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/performance/local/CMakeLists.txt b/tests/performance/local/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-if(NOT MSVC)
+if((NOT MSVC) OR HPX_WITH_VCPKG)
   set(boost_library_dependencies ${Boost_LIBRARIES})
 endif()
 

diff --git a/tests/performance/local/htts_v2/CMakeLists.txt b/tests/performance/local/htts_v2/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-if(NOT MSVC)
+if((NOT MSVC) OR HPX_WITH_VCPKG)
   set(boost_library_dependencies ${Boost_LIBRARIES})
 endif()
 

diff --git a/tests/unit/threads/CMakeLists.txt b/tests/unit/threads/CMakeLists.txt
@@ -22,7 +22,7 @@ if(HPX_WITH_THREAD_LOCAL_STORAGE)
   set(tests ${tests} tss)
 endif()
 
-if(NOT MSVC)
+if((NOT MSVC) OR HPX_WITH_VCPKG)
   set(lockfree_fifo_FLAGS NOLIBS DEPENDENCIES ${Boost_LIBRARIES})
 else()
   set(lockfree_fifo_FLAGS NOLIBS)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -7,7 +7,7 @@ set(tools)
 set(subdirs inspect)
 
 
-if(NOT MSVC)
+if((NOT MSVC) OR HPX_WITH_VCPKG)
   set(tools ${tools} cpu_features)
   set(cpu_features NOLIBS DEPENDENCIES ${BOOST_program_options_LIBRARY})
 endif()

diff --git a/tools/inspect/CMakeLists.txt b/tools/inspect/CMakeLists.txt
@@ -10,7 +10,7 @@ add_hpx_executable(inspect
   NOLIBS
   FOLDER "Tools/Inspect")
 
-if(NOT MSVC)
+if((NOT MSVC) OR HPX_WITH_VCPKG)
   target_link_libraries(inspect_exe ${HPX_TLL_PUBLIC} ${Boost_LIBRARIES})
 endif()