Skip to content

Commit e03d77c

Browse files
authored
Merge pull request #73 from nassipkali/main
Translated build files to conan 2.0
2 parents 08bd475 + 64784b6 commit e03d77c

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

cpp/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
cmake_minimum_required(VERSION 3.15)
22
project(Platform.Exceptions)
3-
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
4-
conan_basic_setup(TARGETS)
3+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
4+
5+
find_package(GTest REQUIRED)
6+
find_package(Platform.Delegates REQUIRED)
57

68
add_library(${PROJECT_NAME}.Library INTERFACE)
79
target_include_directories(${PROJECT_NAME}.Library INTERFACE ${PROJECT_NAME})
8-
target_link_libraries(${PROJECT_NAME}.Library INTERFACE CONAN_PKG::platform.delegates)
10+
target_link_libraries(${PROJECT_NAME}.Library INTERFACE Platform.Delegates::Platform.Delegates)
911

1012
if(${LINKS_PLATFORM_TESTS})
1113
add_executable(${PROJECT_NAME}.Tests ${PROJECT_NAME}.Tests/AllTests.cpp)
1214
target_link_libraries(${PROJECT_NAME}.Tests PRIVATE ${PROJECT_NAME}.Library)
13-
target_link_libraries(${PROJECT_NAME}.Tests PRIVATE CONAN_PKG::gtest)
15+
target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest)
16+
target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest_main)
1417
set_target_properties(${PROJECT_NAME}.Tests PROPERTIES CXX_STANDARD 20)
1518
endif()

cpp/conanfile.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[requires]
22
gtest/cci.20210126
3-
platform.delegates/0.1.3
3+
platform.delegates/0.3.7
44

55
[generators]
6-
cmake
6+
CMakeDeps
7+
CMakeToolchain

0 commit comments

Comments
 (0)