Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translated build to conan 2.0 #391

Merged
merged 1 commit into from
Jul 5, 2023
Merged

Translated build to conan 2.0 #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 27 additions & 25 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 0 additions & 1 deletion cpp/Platform.Data.Doublets/Platform.Data.Doublets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 9 additions & 8 deletions cpp/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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