Merge pull request #391 from nassipkali/main

Translated build to conan 2.0
linksplatform · Jul 5, 2023 · 12ac0c8 · 12ac0c8
2 parents 76a9f6e + e8e7562
commit 12ac0c8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -9,49 +9,51 @@ set(LINKS_PLATFORM_TESTS TRUE)
 set(LINKS_PLATFORM_BENCHMARKS TRUE)
 
 project(Platform.Data.Doublets CXX)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
-list(APPEND LINKS_PLATFORM_EXTRA_FLAGS ${CONAN_USER_PLATFORM.HASHING_suggested_flags})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+find_package(GTest)
+find_package(benchmark)
+find_package(Platform.Interfaces)
+find_package(Platform.Collections.Methods)
+find_package(Platform.Collections)
+find_package(Platform.Numbers)
+find_package(Platform.Memory)
+find_package(Platform.Exceptions)
+find_package(Platform.Data)
+find_package(Platform.Setters)
+find_package(Platform.Ranges)
+find_package(mio)
 
 add_library(${PROJECT_NAME}.Library INTERFACE)
 target_include_directories(${PROJECT_NAME}.Library INTERFACE ${PROJECT_NAME})
-target_include_directories(${PROJECT_NAME}.Library INTERFACE ~/Code/LinksPlatform/Interfaces/cpp/Platform.Interfaces)
-#target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.collections.methods)
-target_include_directories(${PROJECT_NAME}.Library INTERFACE ~/Code/LinksPlatform/Collections.Methods/cpp/Platform.Collections.Methods)
-#target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.collections)
-target_include_directories(${PROJECT_NAME}.Library INTERFACE ~/Code/LinksPlatform/Collections/cpp/Platform.Collections)
-
-target_include_directories(${PROJECT_NAME}.Library INTERFACE ~/Code/LinksPlatform/Numbers/cpp/Platform.Numbers)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.threading)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::mio)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.memory)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.exceptions)
-#target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.data)
-target_include_directories(${PROJECT_NAME}.Library INTERFACE ~/Code/LinksPlatform/Data/cpp/Platform.Data)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.setters)
-target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.ranges)
-#target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.interfaces)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Interfaces::Platform.Interfaces)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Collections.Methods::Platform.Collections.Methods)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Collections::Platform.Collections)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Numbers::Platform.Numbers)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Memory::Platform.Memory)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Exceptions::Platform.Exceptions)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Data::Platform.Data)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Setters::Platform.Setters)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Ranges::Platform.Ranges)
+target_link_libraries(${PROJECT_NAME}.Library INTERFACE mio::mio)
 
 target_link_directories(${PROJECT_NAME}.Library INTERFACE ${CMAKE_CURRENT_LIST_DIR})
 #target_link_libraries(${PROJECT_NAME}.Library INTERFACE doublets_ffi)
 target_link_libraries(${PROJECT_NAME}.Library INTERFACE ${CMAKE_DL_LIBS})
 
-
 target_compile_options(${PROJECT_NAME}.Library INTERFACE ${LINKS_PLATFORM_EXTRA_FLAGS})
 
 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/Platform.Data.Doublets/Platform.Data.Doublets.h b/cpp/Platform.Data.Doublets/Platform.Data.Doublets.h
@@ -13,7 +13,6 @@
 #include <Platform.Exceptions.h>
 #include <Platform.Collections.Methods.h>
 #include <Platform.Collections.h>
-#include <Platform.Threading.h>
 #include <Platform.Memory.h>
 #include <Platform.Data.h>
 #include <Platform.Interfaces.h>

diff --git a/cpp/conanfile.txt b/cpp/conanfile.txt
@@ -1,17 +1,18 @@
 [requires]
 gtest/cci.20210126
 benchmark/1.6.0
-platform.exceptions/0.3.0
-platform.collections.methods/0.1.0
-platform.collections/0.1.0
-platform.threading/0.1.0
+platform.exceptions/0.3.2
+platform.collections.methods/0.3.0
+platform.collections/0.2.1
 platform.memory/0.1.0
 platform.data/0.1.0
-platform.random/0.1.0
-platform.interfaces/0.2.5
-platform.ranges/0.1.3
+platform.random/0.2.0
+platform.interfaces/0.3.41
+platform.ranges/0.2.0
+platform.numbers/0.1.0
 mio/cci.20201220
 
 [generators]
-cmake
+CMakeDeps
+CMakeToolchain