CMakeLists.txt

@@ -30,8 +30,12 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(CMakeBuildTypeUtils)
 
 # ################### Packages ####################
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+find_package(fast-cpp-csv-parser REQUIRED)
+find_package(TBB REQUIRED)
+find_package(Boost REQUIRED COMPONENTS program_options log log_setup)
+find_package(Eigen3 REQUIRED)
+find_package(range-v3 REQUIRED)
+find_package(fmt REQUIRED)
 
 find_package(LEMON REQUIRED)
 find_package(COIN REQUIRED)
@@ -39,6 +43,8 @@ if(${WITH_GUROBI} STREQUAL "ON")
     find_package(GUROBI REQUIRED)
 endif()
 
+find_package(GTest)
+
 # #################### Sources ######################
 file(GLOB SRC "src/*.cpp" "src/*/*.cpp" "src/*/*/*.cpp" "src/*/*/*/*.cpp")
 
@@ -48,12 +54,13 @@ add_library(landscape_opt ${SRC})
 target_include_directories(landscape_opt PUBLIC include)
 target_include_directories(landscape_opt PUBLIC thirdparty)
 
-target_link_libraries(landscape_opt CONAN_PKG::fast-cpp-csv-parser)
-target_link_libraries(landscape_opt CONAN_PKG::tbb)
-target_link_libraries(landscape_opt CONAN_PKG::boost)
-target_link_libraries(landscape_opt CONAN_PKG::fmt)
-target_link_libraries(landscape_opt CONAN_PKG::eigen)
-target_link_libraries(landscape_opt CONAN_PKG::range-v3)
+target_link_libraries(landscape_opt
+                      fast-cpp-csv-parser::fast-cpp-csv-parser)
+target_link_libraries(landscape_opt TBB::tbb)
+target_link_libraries(landscape_opt Boost::program_options Boost::log Boost::log_setup)
+target_link_libraries(landscape_opt Eigen3::Eigen)
+target_link_libraries(landscape_opt range-v3::range-v3)
+target_link_libraries(landscape_opt fmt::fmt)
 
 target_include_directories(landscape_opt PUBLIC ${LEMON_INCLUDE_DIRS})
 target_link_libraries(landscape_opt ${LEMON_LIBRARIES})
@@ -80,7 +87,7 @@ enable_testing()
 
 add_executable(test_test test/test.cpp)
 target_include_directories(test_test PUBLIC include)
-target_link_libraries(test_test CONAN_PKG::gtest)
+target_link_libraries(test_test GTest::gtest)
 target_link_libraries(test_test landscape_opt)
 
 include(GoogleTest)

CMakePresets.json

+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 15,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "conan-release",
+            "displayName": "'conan-release' config",
+            "description": "'conan-release' configure using 'Unix Makefiles' generator",
+            "generator": "Unix Makefiles",
+            "cacheVariables": {
+                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
+                "CMAKE_BUILD_TYPE": "Release"
+            },
+            "toolchainFile": "/home/plaiseek/Projects/landscape_opt_networks_submission/conan_toolchain.cmake",
+            "binaryDir": "/home/plaiseek/Projects/landscape_opt_networks_submission"
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "conan-release",
+            "configurePreset": "conan-release"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "conan-release",
+            "configurePreset": "conan-release"
+        }
+    ]
+}
\ No newline at end of file

CMakeUserPresets.json

+{
+    "version": 4,
+    "vendor": {
+        "conan": {}
+    },
+    "include": [
+        "/home/plaiseek/Projects/landscape_opt_networks_submission/build/CMakePresets.json"
+    ]
+}
\ No newline at end of file

Makefile

 MAKEFLAGS += --no-print-directory
 
 CPUS?=$(shell getconf _NPROCESSORS_ONLN || echo 1)
-CC:=g++
+CC:=g++-11
 
 BUILD_DIR = build
 
@@ -9,13 +9,12 @@ BUILD_DIR = build
 
 all: $(BUILD_DIR)
 	@cd $(BUILD_DIR) && \
-	cmake --build . --parallel $(CPUS)
+	cmake --build . --config Release --parallel $(CPUS)
 
 $(BUILD_DIR):
-	@mkdir $(BUILD_DIR) && \
-	cd $(BUILD_DIR) && \
-	conan install .. && \
-	cmake -DCMAKE_CXX_COMPILER=$(CC) -DCMAKE_BUILD_TYPE=Release -DWARNINGS=ON -DHARDCORE_WARNINGS=OFF -DCOMPILE_FOR_NATIVE=OFF -DCOMPILE_WITH_LTO=OFF -DWITH_GUROBI=ON ..
+	@conan install . -of=$(BUILD_DIR) -b=missing
+	@cd $(BUILD_DIR) && \
+	cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_CXX_COMPILER=$(CC) -DCMAKE_BUILD_TYPE=Release -DWARNINGS=ON -DHARDCORE_WARNINGS=OFF -DCOMPILE_FOR_NATIVE=OFF -DCOMPILE_WITH_LTO=OFF ..
 
 test: all
 	@cd $(BUILD_DIR) && \

README.md

@@ -14,5 +14,8 @@ Follow this [guide](INSTALL.md) to install the prerequisites, then compile with
     cd landscape_opt_networks_submission
     make
 
+## Note
+The library has evolved since the submission and is available at https://github.com/fhamonic/landscape_opt
+
 ## Acknowledgments
 This work is part of the PhD thesis of François Hamonic which is funded by Region Sud (https://www.maregionsud.fr/) and Natural Solutions (https://www.natural-solutions.eu/)

conanfile.txt

 [requires]
-fast-cpp-csv-parser/cci.20200830
+fast-cpp-csv-parser/cci.20211104
 
-tbb/2020.3
-boost/1.78.0
-fmt/8.0.1
+onetbb/2021.10.0
+boost/1.83.0
+fmt/[>=10.0.0]
 eigen/3.4.0
-range-v3/0.11.0
+range-v3/[>=0.11.0]
 
-gtest/cci.20210126
+gtest/[>=1.10.0 <cci]
 
 [generators]
-cmake
+CMakeDeps
\ No newline at end of file
+CMakeToolchain
\ No newline at end of file