From 8589634d92397f0866dea6083b846f0c3a3d123b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 1 Jul 2021 09:41:42 +0200
Subject: [PATCH] WIP: conan
---
CMakeLists.txt | 7 +++++--
conanfile.txt | 2 ++
test/CMakeLists.txt | 8 ++++----
3 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 conanfile.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 374b49d..447f4d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,15 @@ project(libcaosdb_inttests
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# dependency management with conan
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
# ignore some warnings here
add_compile_options(-Wno-unused-parameter -Wno-unused-result -g)
-message(STATUS "System prefix path: ${CMAKE_SYSTEM_PREFIX_PATH}")
-message(STATUS "Local prefix path: ${CMAKE_PREFIX_PATH}")
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
enable_testing()
add_subdirectory(test)
diff --git a/conanfile.txt b/conanfile.txt
new file mode 100644
index 0000000..c0b69cd
--- /dev/null
+++ b/conanfile.txt
@@ -0,0 +1,2 @@
+[requires]
+libcaosdb/0.0.1
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0e44b66..551eeb3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,10 +23,10 @@ set(test_cases
test_connection
)
-find_package(caosdb REQUIRED)
-message(STATUS "Found libcaosdb: ${caosdb_DIR}")
+#find_package(caosdb REQUIRED)
+#message(STATUS "Found libcaosdb: ${caosdb_DIR}")
-include(FetchGTest)
+#include(FetchGTest)
# add special cmake functions for gtest
include(GoogleTest REQUIRED)
@@ -36,7 +36,7 @@ math(EXPR len_test_cases "${len_test_cases} - 1")
foreach (i RANGE "${len_test_cases}")
list(GET test_cases ${i} test_case_name)
add_executable(${test_case_name} ${test_case_name}.cpp)
- target_link_libraries(${test_case_name} PRIVATE gtest_main caosdb::caosdb)
+ target_link_libraries(${test_case_name} PRIVATE caosdb::caosdb ${CONAN_LIBS})
set_target_properties(${test_case_name} PROPERTIES CXX_CLANG_TIDY "")
gtest_discover_tests(${test_case_name}
PROPERTIES
--
GitLab