Resolve "EXTERN: Adapt to Conan 2"

Summary

Updating from Conan 1 to Conan 2.5 required several changes, both on the conanfile.py as well as the CMakeLists.txt file(s).

Related to

• #73 (closed)
• #80 (closed)
• #82 (closed)
• #83 (closed)

Related MR for integration tests: caosdb-cppinttest!35 (merged)

Focus

The biggest changes are in conanfile.py and CMakeLists.txt all according to the migration guide. Crucial here are

• Conan now doesn't appear in the CMakeLists.txt files anymore. Instead, Conan generates CMakeToolChain files, which handle all the necessary includes etc. The toolchain files are passed to CMake as arguments.
• Packages are included in our CMakeLists.txt using CMake's FindPackage
• Conan 2.0 builds into build/<build_type>, i.e. build/Release or build/Debug

Test Environment

How to set up a test environment for manual testing?

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related issues
• Up-to-date CHANGELOG.md (or not necessary)
• Up-to-date JSON schema (or not necessary)
• Appropriate user and developer documentation (or not necessary)
  • How do I use the software? Assume "stupid" users.
  • How do I develop or debug the software? Assume novice developers.
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md (or not necessary)
• Appropriate user and developer documentation (or not necessary)
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

CMakeLists.txt

@@ -147,6 +147,9 @@ add_custom_command(
         ${PROTO_FILES}
       DEPENDS ${PROTO_FILES})
 
+# show generated files
+message(DEBUG "GRPC_GENERATED: ${GRPC_GENERATED}")
+
 ###############################################################################
 ### Set up main targets
 ### * [caosdb_grpc] - only in Debug builds. Otherwise this library is compiled
@@ -157,51 +160,66 @@ add_custom_command(
 ### * ccaosdbcli - A plain C test client.
 ###############################################################################
 
-find_package(gRPC)
-find_package(protobuf)
-find_package(Boost)
-find_package(GTest)
+find_package(gRPC CONFIG REQUIRED)
+find_package(Protobuf CONFIG REQUIRED)
+find_package(Boost REQUIRED)
+find_package(GTest REQUIRED)
+
+# print include directories for debugging
+message(DEBUG "CMAKE_INCLUDE_PATH: ${CMAKE_INCLUDE_PATH}")
+message(DEBUG "PROTOBUF_INCLUDE_DIRS: ${PROTOBUF_INCLUDE_DIRS}")
+message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
+
 
 # libcaosdb
+# ---------
+
+# In Debug, build separate libraries for grpc-generated code and caosdb
 if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-  add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
-  add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
-  target_link_libraries(caosdb caosdb_grpc 
-        grpc::grpc protobuf::protobuf boost::boost gtest::gtest)
-  set(LIBCAOSDB caosdb caosdb_grpc)
-
-  target_include_directories(caosdb_grpc PUBLIC
-        $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
-        $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
+
+    add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
+    target_link_libraries(caosdb_grpc 
+        grpc::grpc protobuf::protobuf boost::boost
+    )
+    target_include_directories(caosdb_grpc PUBLIC
+        $<BUILD_INTERFACE:${PROJECT_INCLUDE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
         $<INSTALL_INTERFACE:include>
-  )
-  target_include_directories(caosdb_grpc SYSTEM PUBLIC
-        ${CONAN_INCLUDE_DIRS}
-  )
+    )
+
+   add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
+
+   target_link_libraries(caosdb 
+        caosdb_grpc grpc::grpc protobuf::protobuf boost::boost
+    )
+
+    set(LIBCAOSDB caosdb caosdb_grpc)
 else()
-  add_library(caosdb
-      SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
-  set(LIBCAOSDB caosdb)
+    add_library(caosdb
+        SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
+     target_link_libraries(caosdb
+        grpc::grpc protobuf::protobuf boost::boost
+        stdc++fs
+    )
+     set(LIBCAOSDB caosdb)
 endif()
 
-target_link_libraries(caosdb
-    grpc::grpc protobuf::protobuf boost::boost gtest::gtest
-    stdc++fs
-)
+
 target_include_directories(caosdb PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/src>
     $<INSTALL_INTERFACE:include>
 )
-target_include_directories(caosdb SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
+
+
+
 
 # libccaosdb
+# ----------
 add_library(ccaosdb SHARED src/ccaosdb.cpp)
 target_link_libraries(ccaosdb
-    grpc::grpc protobuf::protobuf boost::boost gtest::gtest
+    grpc::grpc protobuf::protobuf boost::boost
     ${LIBCAOSDB}
     stdc++fs
 )
@@ -224,11 +242,13 @@ target_include_directories(ccaosdbcli SYSTEM PUBLIC
 )
 
 target_link_libraries(ccaosdbcli
-    grpc::grpc protobuf::protobuf boost::boost gtest::gtest
+    grpc::grpc protobuf::protobuf boost::boost
     ${LIBCAOSDB}
     ccaosdb
 )
 
+# cxxcaosdbcli
+# ------------
 add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
 target_include_directories(cxxcaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
@@ -240,7 +260,7 @@ target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
 )
 target_link_libraries(cxxcaosdbcli
     ${LIBCAOSDB}
-    grpc::grpc protobuf::protobuf boost::boost gtest::gtest
+    grpc::grpc protobuf::protobuf boost::boost
 )