From 0dc9eeeea2b993836340d3f706b7a13f89722e32 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Tue, 14 Jan 2025 16:18:53 +0100 Subject: [PATCH] Add optional support for vcpkg --- CMakePresets.json | 10 +++++++++- tests/tests_configuration/CMakeLists.txt | 4 ++-- tests/tests_dramsys/CMakeLists.txt | 4 ++-- tests/tests_simulator/CMakeLists.txt | 4 ++-- vcpkg.json | 18 ++++++++++++++++++ 5 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 vcpkg.json diff --git a/CMakePresets.json b/CMakePresets.json index 60a68233..44030b5a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -6,6 +6,14 @@ "patch": 0 }, "configurePresets": [ + { + "name": "vcpkg", + "hidden": true, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_INSTALL_OPTIONS": "--no-print-usage" + } + }, { "name": "cmake-pedantic", "hidden": true, @@ -86,4 +94,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/tests_configuration/CMakeLists.txt b/tests/tests_configuration/CMakeLists.txt index b7732f6a..7ff84def 100644 --- a/tests/tests_configuration/CMakeLists.txt +++ b/tests/tests_configuration/CMakeLists.txt @@ -11,8 +11,8 @@ set_target_properties(tests_configuration PROPERTIES FOLDER tests/configuration) target_link_libraries(tests_configuration PRIVATE DRAMSys::config - gtest - gtest_main + GTest::gtest + GTest::gtest_main ) gtest_discover_tests(tests_configuration diff --git a/tests/tests_dramsys/CMakeLists.txt b/tests/tests_dramsys/CMakeLists.txt index e2b70a28..843fd4b0 100644 --- a/tests/tests_dramsys/CMakeLists.txt +++ b/tests/tests_dramsys/CMakeLists.txt @@ -14,8 +14,8 @@ target_include_directories(tests_dramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties(tests_dramsys PROPERTIES FOLDER tests) target_link_libraries(tests_dramsys DRAMSys::libdramsys - gtest - gtest_main + GTest::gtest + GTest::gtest_main ) gtest_discover_tests(tests_dramsys diff --git a/tests/tests_simulator/CMakeLists.txt b/tests/tests_simulator/CMakeLists.txt index 9841e539..ea33b196 100644 --- a/tests/tests_simulator/CMakeLists.txt +++ b/tests/tests_simulator/CMakeLists.txt @@ -13,8 +13,8 @@ set_target_properties(tests_simulator PROPERTIES FOLDER tests/simulator) target_include_directories(tests_simulator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(tests_simulator PRIVATE DRAMSys::simulator - gtest - gtest_main + GTest::gtest + GTest::gtest_main ) gtest_discover_tests(tests_simulator diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..f4d1c3d4 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "dramsys", + "version": "5.0", + "dependencies": [ + "benchmark", + "gtest", + "pybind11", + "python3", + { + "name": "sqlite3", + "features": [ + "rtree" + ] + }, + "systemc" + ], + "builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b" +}