Change CONAN_PKG::xxx casing following upstream breaking changes. Ope…

…nSSL is an exception Read the issue, and the specific OpenSSL comment here: conan-io/conan#6269 (comment)
NREL · Jan 9, 2020 · 90cfe51 · 90cfe51
1 parent 95c8d39
commit 90cfe51
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 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/embedded/CMakeLists.txt b/embedded/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(CreateEmbeddedSource
   CreateEmbeddedSource.cpp
 )
 
-target_link_libraries(CreateEmbeddedSource CONAN_PKG::ZLIB)
+target_link_libraries(CreateEmbeddedSource CONAN_PKG::zlib)
 
 # Add a specific manifest for CreateEmbeddedSource that will include the LongPathAware attribute, which,
 # in conjunction with the regkey LongPathsEnabled=1 will make it work with paths that are longer than MAX_PATH (win10 only)

diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
@@ -296,7 +296,7 @@ target_link_libraries(openstudio
  openstudio_radiance
 )
 
-# Change to CONAN_PKG::OpenSSL vs OPENSSL_CRYPTO_LIBRARY if this is needed.
+# Change to CONAN_PKG::openssl vs OPENSSL_CRYPTO_LIBRARY if this is needed.
 # link CLI with ruby static library, ruby bindings (openstudio.so) are linked to dynamic ruby
 #if (APPLE)
 #  target_link_libraries(openstudio

diff --git a/src/generateiddfactory/CMakeLists.txt b/src/generateiddfactory/CMakeLists.txt
@@ -25,7 +25,7 @@ add_executable(${target_name}
 set_target_properties(${target_name} PROPERTIES COMPILE_DEFINITIONS OPENSTUDIO_DIRECT_INCLUDE)
 
 target_link_libraries(${target_name}
-  CONAN_PKG::Boost
+  CONAN_PKG::boost
   #CONAN_PKG::boost_filesystem
   #CONAN_PKG::boost_regex
   #CONAN_PKG::boost_program_options

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

diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
@@ -402,11 +402,12 @@ add_subdirectory(pch)
 
 set(${target_name}_depends
   CONAN_PKG::sqlite3
-  CONAN_PKG::JsonCpp
-  CONAN_PKG::ZLIB
+  CONAN_PKG::jsoncpp
+  CONAN_PKG::zlib
   CONAN_PKG::fmt
   CONAN_PKG::pugixml
-  CONAN_PKG::Boost
+  CONAN_PKG::boost
+  #If we use the boost modular package:
   #CONAN_PKG::boost_filesystem
   #CONAN_PKG::boost_crc
   #CONAN_PKG::boost_regex
@@ -418,6 +419,7 @@ set(${target_name}_depends
   #CONAN_PKG::boost_functional
   #CONAN_PKG::boost_geometry
   CONAN_PKG::cpprestsdk
+  # TODO: this may change to lowercase
   CONAN_PKG::OpenSSL
   CONAN_PKG::geographiclib
 )