Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • caosdb/src/caosdb-cpplib
1 result
Select Git revision
Loading items
Show changes
...@@ -14,7 +14,7 @@ set(test_cases ...@@ -14,7 +14,7 @@ set(test_cases
# dependencies # dependencies
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup() conan_basic_setup(KEEP_RPATHS)
# supress warnings during build of gtest # supress warnings during build of gtest
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
...@@ -33,6 +33,9 @@ foreach (i RANGE "${len_test_cases}") ...@@ -33,6 +33,9 @@ foreach (i RANGE "${len_test_cases}")
${CONAN_LIBS_GTEST} ${CONAN_LIBS_GRPC} ${CONAN_LIBS_ABSEIL} ${CONAN_LIBS_GTEST} ${CONAN_LIBS_GRPC} ${CONAN_LIBS_ABSEIL}
${CONAN_LIBS_OPENSSL} ${CONAN_LIBS_C-ARES} ${CONAN_LIBS_BZIP2} ${CONAN_LIBS_OPENSSL} ${CONAN_LIBS_C-ARES} ${CONAN_LIBS_BZIP2}
${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_ZLIB}) ${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_ZLIB})
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
target_link_libraries(${test_case_name} PRIVATE caosdb_grpc)
endif()
target_include_directories(${test_case_name} PUBLIC ${CONAN_INCLUDE_DIRS}) target_include_directories(${test_case_name} PUBLIC ${CONAN_INCLUDE_DIRS})
set_target_properties(${test_case_name} set_target_properties(${test_case_name}
PROPERTIES PROPERTIES
......
...@@ -6,6 +6,9 @@ from conans import ConanFile, CMake, tools ...@@ -6,6 +6,9 @@ from conans import ConanFile, CMake, tools
class LibcaosdbTestConan(ConanFile): class LibcaosdbTestConan(ConanFile):
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
generators = "cmake" generators = "cmake"
build_requires = [
("gtest/1.11.0"),
]
def build(self): def build(self):
cmake = CMake(self) cmake = CMake(self)
......