translated build to conan 2.0

Signed-off-by: Daulet <uralskdev@gmail.com>
linksplatform · Jul 4, 2023 · e2f8cd9 · e2f8cd9
1 parent 04a487f
commit e2f8cd9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -7,30 +7,27 @@ set(LINKS_PLATFORM_EXTRA_FLAGS "" CACHE STRING "Extra compiler flags")
 set(CONAN_DISABLE_CHECK_COMPILER TRUE)
 
 project(Platform.Collections.Methods CXX)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# required for usage of conan
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
-list(APPEND LINKS_PLATFORM_EXTRA_FLAGS ${CONAN_USER_PLATFORM.HASHING_suggested_flags})
+find_package(GTest)
+find_package(benchmark)
+find_package(Platform.Interfaces)
 
 add_library(${PROJECT_NAME}.Library INTERFACE)
 target_include_directories(${PROJECT_NAME}.Library INTERFACE ${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.interfaces)
-
-target_compile_options(${PROJECT_NAME}.Library INTERFACE ${LINKS_PLATFORM_EXTRA_FLAGS})
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Interfaces::Platform.Interfaces)
 
 if(${LINKS_PLATFORM_TESTS})
     add_executable(${PROJECT_NAME}.Tests ${PROJECT_NAME}.Tests/AllTests.cpp)
     set_target_properties(${PROJECT_NAME}.Tests PROPERTIES CXX_STANDARD 20)
-    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE CONAN_PKG::gtest)
+    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest)
+    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest_main)
     target_link_libraries(${PROJECT_NAME}.Tests PRIVATE ${PROJECT_NAME}.Library)
 endif()
 
 if(${LINKS_PLATFORM_BENCHMARKS})
     add_executable(${PROJECT_NAME}.Benchmarks ${PROJECT_NAME}.Benchmarks/AllBenchmarks.cpp)
     set_target_properties(${PROJECT_NAME}.Benchmarks PROPERTIES CXX_STANDARD 20)
-    target_link_libraries(${PROJECT_NAME}.Benchmarks PRIVATE CONAN_PKG::gtest)
-    target_link_libraries(${PROJECT_NAME}.Benchmarks PRIVATE CONAN_PKG::benchmark)
+    target_link_libraries(${PROJECT_NAME}.Benchmarks PRIVATE benchmark::benchmark)
     target_link_libraries(${PROJECT_NAME}.Benchmarks PRIVATE ${PROJECT_NAME}.Library)
 endif()
diff --git a/cpp/conanfile.txt b/cpp/conanfile.txt
@@ -1,6 +1,7 @@
 [requires]
-platform.interfaces/0.2.5
+platform.interfaces/0.3.41
 gtest/cci.20210126
 benchmark/1.6.0
 [generators]
-cmake
+CMakeDeps
+CMakeToolchain