Resolve "EXTERN: Adapt to Conan 2"

Review changes
Download
Patches
Plain diff

Merged Resolve "EXTERN: Adapt to Conan 2"

Overview 8
Commits 33
Pipelines 19
Changes 1

Merged Joscha Schmiedt requested to merge f-73-extern-adapt-to-conan-2-0 into dev 1 year ago

Overview 8
Commits 33
Pipelines 19
Changes 1

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.

Edited 10 months ago by Florian Spreckelsen

Merge request reports

0 Assignees

0 Reviewers

Request review from

Labels

None

Select labels

Manage project labels

Milestone

None

Time tracking

No estimate or time spent

0 Participants

Viewing commit b740e836

Prev Next

Show latest version

1 file

+ 2

− 1

Compare changes

Side-by-side
Inline

Show whitespace changes

Show one file at a time

b740e836

WIP: Fix CMakeLists.txt of tests for Conan 2.0 · b740e836

Joscha Schmiedt authored 1 year ago

Still crashes with weird linker errors regarding boost::test (??)

usr/bin/ld: /home/joscha/.conan2/p/b/boostec508655df7a4/p/lib/libboost_test_exec_monitor.a(test_main.o): in function `test_main_caller::operator()()':
/home/joscha/.conan2/p/boostada19f4305785/s/src/./boost/test/impl/test_main.ipp:34: undefined reference to `test_main(int, char**)'
/usr/bin/ld: /home/joscha/.conan2/p/b/boostec508655df7a4/p/lib/libboost_test_exec_monitor.a(test_main.o): in function `test_main_caller::operator()()':
/home/joscha/.conan2/p/boostada19f4305785/s/src/./boost/test/impl/test_main.ipp:34: undefined reference to `test_main(int, char**)'
collect2: error: ld returned 1 exit status
gmake[3]: *** [test/CMakeFiles/test_data_type.dir/build.make:223: test/test_data_type] Error 1
gmake[2]: *** [CMakeFiles/Makefile2:347: test/CMakeFiles/test_data_type.dir/all] Error 2
gmake[2]: *** Waiting for unfinished jobs....
collect2: error: ld returned 1 exit status
gmake[3]: *** [test/CMakeFiles/test_configuration.dir/build.make:223: test/test_configuration] Error 1
gmake[2]: *** [CMakeFiles/Makefile2:375: test/CMakeFiles/test_configuration.dir/all] Error 2
/usr/bin/ld: /home/joscha/.conan2/p/b/boostec508655df7a4/p/lib/libboost_test_exec_monitor.a(test_main.o): in function `test_main_caller::operator()()':
/home/joscha/.conan2/p/boostada19f4305785/s/src/./boost/test/impl/test_main.ipp:34: undefined reference to `test_main(int, char**)'
/usr/bin/ld: /home/joscha/.conan2/p/b/boostec508655df7a4/p/lib/libboost_test_exec_monitor.a(test_main.o): in function `test_main_caller::operator()()':
/home/joscha/.conan2/p/boostada19f4305785/s/src/./boost/test/impl/test_main.ipp:34: undefined reference to `test_main(int, char**)'
collect2: error: ld returned 1 exit status
gmake[3]: *** [test/CMakeFiles/test_entity.dir/build.make:223: test/test_entity] Error 1
gmake[2]: *** [CMakeFiles/Makefile2:431: test/CMakeFiles/test_entity.dir/all] Error 2
collect2: error: ld returned 1 exit status
gmake[3]: *** [test/CMakeFiles/test_connection.dir/build.make:223: test/test_connection] Error 1
gmake[2]: *** [CMakeFiles/Makefile2:403: test/CMakeFiles/test_connection.dir/all] Error 2
gmake[1]: *** [Makefile:146: all] Error 2
gmake[1]: Leaving directory '/home/joscha/caosdb/src/caosdb-cpplib/build/Debug'

test/CMakeLists.txt

+ 2

− 1

@@ -51,6 +51,7 @@ set(_CMAKE_CXX_CLANG_TIDY_TEST_CHECKS
)

# add special cmake functions for gtest
find_package(GTest REQUIRED)
include(GoogleTest)


@@ -63,7 +64,7 @@ foreach (i RANGE "${len_test_cases}")
    set(libcaosdb_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp
        ${libcaosdb_TEST_SRC}")
    target_link_libraries(${test_case_name}
        PRIVATE ${LIBCAOSDB} ccaosdb ${CONAN_LIBS_GTEST} ${CONAN_LIBS_BOOST})
        PRIVATE ${LIBCAOSDB} ccaosdb gtest::gtest boost::boost)
    target_include_directories(${test_case_name}
      PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
    if(_LINTING)