Adjust linking targets, Boost is monolithic, jsoncpp and gtest were r…

…enamed (casing) I'm not sure about some of the boost libs... they seem to be header only, not sure if I need something specific
sasobadovinac · Dec 17, 2019 · e3f6d9a · e3f6d9a
1 parent e8a6b96
commit e3f6d9a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/ProjectMacros.cmake b/ProjectMacros.cmake
@@ -72,7 +72,7 @@ macro(CREATE_TEST_TARGETS BASE_NAME SRC DEPENDENCIES)
     endif()
 
     target_link_libraries(${BASE_NAME}_tests
-      CONAN_PKG::gtest
+      CONAN_PKG::GTest
       ${ALL_DEPENDENCIES}
     )
 

diff --git a/src/generateiddfactory/CMakeLists.txt b/src/generateiddfactory/CMakeLists.txt
@@ -25,10 +25,11 @@ add_executable(${target_name}
 set_target_properties(${target_name} PROPERTIES COMPILE_DEFINITIONS OPENSTUDIO_DIRECT_INCLUDE)
 
 target_link_libraries(${target_name}
-  CONAN_PKG::boost_filesystem
-  CONAN_PKG::boost_regex
-  CONAN_PKG::boost_program_options
-  CONAN_PKG::boost_crc
+  CONAN_PKG::Boost
+  #CONAN_PKG::boost_filesystem
+  #CONAN_PKG::boost_regex
+  #CONAN_PKG::boost_program_options
+  #CONAN_PKG::boost_crc
 )
 
 # generate the IddFactory files

diff --git a/src/install_utility/CMakeLists.txt b/src/install_utility/CMakeLists.txt
@@ -1,7 +1,8 @@
 add_executable(install_utility main.cpp)
 
 target_link_libraries(install_utility
-  CONAN_PKG::boost_filesystem 
+  CONAN_PKG::Boost
+  # CONAN_PKG::boost_filesystem
 )
 
 if( WIN32 )

diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
@@ -402,20 +402,21 @@ add_subdirectory(pch)
 
 set(${target_name}_depends
   CONAN_PKG::sqlite3
-  CONAN_PKG::jsoncpp
+  CONAN_PKG::JsonCpp
   CONAN_PKG::ZLIB
   CONAN_PKG::fmt
   CONAN_PKG::pugixml
-  CONAN_PKG::boost_filesystem
-  CONAN_PKG::boost_crc
-  CONAN_PKG::boost_regex
-  CONAN_PKG::boost_algorithm
-  CONAN_PKG::boost_uuid
-  CONAN_PKG::boost_log
-  CONAN_PKG::boost_program_options
-  CONAN_PKG::boost_numeric_ublas
-  CONAN_PKG::boost_functional
-  CONAN_PKG::boost_geometry
+  CONAN_PKG::Boost
+  #CONAN_PKG::boost_filesystem
+  #CONAN_PKG::boost_crc
+  #CONAN_PKG::boost_regex
+  #CONAN_PKG::boost_algorithm
+  #CONAN_PKG::boost_uuid
+  #CONAN_PKG::boost_log
+  #CONAN_PKG::boost_program_options
+  #CONAN_PKG::boost_numeric_ublas
+  #CONAN_PKG::boost_functional
+  #CONAN_PKG::boost_geometry
   CONAN_PKG::cpprestsdk
   CONAN_PKG::OpenSSL
   CONAN_PKG::geographiclib