diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e26dfeeb6e641a33dae4961196235bdb965b21b..cad7657dfa543e02eca53f1ecc7545c92bc0a550 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "cmake.configureOnOpen": false +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 25736c50a9b4b1440c854cf3b93485b38faf05e5..77f2825c49145ebaa3fd7731968703d1543e6927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.8.2) # required for cxx_std_17 project(Concepts-For-Images VERSION 0.2 LANGUAGES CXX) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - SET(COMPILER_CLANG OFF) SET(COMPILER_GCC OFF) SET(COMPILER_ICC OFF) diff --git a/conanfile.py b/conanfile.py index 845b56f1c4fa46fe188697429a9d6c1ee1a3103f..25fc27c598a60b7fb83d560e2d8557f7ac156fca 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,7 +7,7 @@ class ConceptsForImages(ConanFile): url = "https://gitlab.lrde.epita.fr/mroynard/concepts-for-images" description = "Images concepts implementation in C++17." settings = "os", "compiler", "arch", "build_type", "cppstd" - generators = "cmake" + generators = "cmake_find_package" def source(self): git = tools.Git() diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index d2d22862d96d44f49f0526442734f2fec306961c..be606148eda6a7f477c5539f143b46e27836051b 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,8 +1,12 @@ +set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) +find_package(concepts-fundamentals REQUIRED) +find_package(blackmagic REQUIRED) + set(CONCEPTS-FOR-IMAGES_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include") add_library(Concepts-For-Images INTERFACE) target_compile_features(Concepts-For-Images INTERFACE cxx_std_17) target_include_directories(Concepts-For-Images INTERFACE ${CONCEPTS-FOR-IMAGES_INCLUDE_DIR}) -target_link_libraries(Concepts-For-Images INTERFACE CONAN_PKG::blackmagic CONAN_PKG::concepts-fundamentals) +target_link_libraries(Concepts-For-Images INTERFACE blackmagic::blackmagic concepts-fundamentals::concepts-fundamentals) target_compile_options(Concepts-For-Images INTERFACE -fconcepts) # Gcc experimental concept support diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fe808cd9f5281056d9ed5275f20c26210c8aca20..002d8d3296f9b0448cf2b1b633259257052fe616 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,7 +9,7 @@ macro(add_unit_test Executable Source) add_executable(test_${Executable} EXCLUDE_FROM_ALL ${Source}) add_test(NAME test_${Executable} COMMAND test_${Executable} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test) - target_link_libraries(test_${Executable} PRIVATE Concepts-For-Images CONAN_PKG::gtest Threads::Threads) + target_link_libraries(test_${Executable} PRIVATE Concepts-For-Images gtest::gtest Threads::Threads) target_include_directories(test_${Executable} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) if(PLATFORM_UNIX AND COMPILER_CLANG) @@ -23,7 +23,9 @@ option(WITH_TESTS "Compile and run tests" ON) # if(WITH_TESTS) -find_package(Threads REQUIRED) -add_subdirectory(concepts-for-images) + set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) + find_package(gtest REQUIRED) + find_package(Threads REQUIRED) + add_subdirectory(concepts-for-images) # endif(WITH_TESTS)