Skip to content

Commit 5fb7d38

Browse files
committed
Add GTA Run Settings
1 parent 5f67c7c commit 5fb7d38

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<GoogleTestAdapterSettings>
4+
<SolutionSettings>
5+
<Settings>
6+
<WorkingDir>@MODELICA_TABLE_ADDITIONS_TEST_DIR@</WorkingDir>
7+
</Settings>
8+
</SolutionSettings>
9+
</GoogleTestAdapterSettings>
10+
</RunSettings>

ModelicaTableAdditions/Resources/BuildProjects/CMake/test.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
project(${CMAKE_PROJECT_NAME}Tests CXX)
1+
project(${CMAKE_PROJECT_NAME} CXX)
22

33
# Set up GoogleTest
44
include(FetchContent)
55

66
FetchContent_Declare(
77
googletest
88
GIT_REPOSITORY https://github.com/google/googletest.git
9-
GIT_TAG v1.14.0
9+
GIT_TAG v1.15.2
1010
)
1111

1212
# For Windows: Prevent overriding the parent project's compiler/linker settings
@@ -89,6 +89,11 @@ if(EXISTS "${MODELICA_TABLE_ADDITIONS_TEST_DIR}")
8989
WORKING_DIRECTORY "${MODELICA_TABLE_ADDITIONS_TEST_DIR}"
9090
)
9191
endforeach()
92+
configure_file(
93+
${CMAKE_SOURCE_DIR}/BuildProjects/CMake/Modelica_Table_Additions.gta.runsettings.in
94+
${CMAKE_BINARY_DIR}/Modelica_Table_Additions.gta.runsettings
95+
@ONLY
96+
)
9297
else()
9398
message(WARNING
9499
" Testsuite not found in \"${MODELICA_TABLE_ADDITIONS_TEST_DIR}\"."

ModelicaTableAdditions/Resources/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15)
1+
cmake_minimum_required(VERSION 3.21)
22

33
if(POLICY CMP0091)
44
cmake_policy(SET CMP0091 NEW)
@@ -12,7 +12,6 @@ project(Modelica_Table_Additions C)
1212
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1313

1414
include(BuildProjects/CMake/Modelica_platform.cmake)
15-
include(BuildProjects/CMake/Modelica_utilities.cmake)
1615

1716
set(MODELICA_TABLE_ADDITIONS_RESOURCES_DIR "${CMAKE_SOURCE_DIR}")
1817
set(CMAKE_INSTALL_PREFIX "${MODELICA_TABLE_ADDITIONS_RESOURCES_DIR}" CACHE PATH "Library installation prefix path (don't change)" FORCE)
@@ -25,7 +24,10 @@ include(BuildProjects/CMake/options.cmake)
2524

2625
if(BUILD_TESTING)
2726
enable_testing()
28-
include(CTest)
27+
if(PROJECT_IS_TOP_LEVEL)
28+
include(CTest)
29+
endif()
30+
include(BuildProjects/CMake/Modelica_utilities.cmake)
2931
include(BuildProjects/CMake/test.cmake)
3032
endif()
3133

0 commit comments

Comments
 (0)