File tree Expand file tree Collapse file tree 3 files changed +13
-14
lines changed
Expand file tree Collapse file tree 3 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 1- cmake_minimum_required (VERSION 3.13 )
1+ cmake_minimum_required (VERSION 3.12 )
22
33project (CubicInterpolation LANGUAGES CXX)
44
55set (CubicInterpolation_VERSION_MAJOR 0)
66set (CubicInterpolation_VERSION_MINOR 1)
7- set (CubicInterpolation_VERSION_PATCH 0 )
7+ set (CubicInterpolation_VERSION_PATCH 3 )
88set (CubicInterpolation_VERSION ${CubicInterpolation_VERSION_MAJOR} .${CubicInterpolation_VERSION_MINOR} .${CubicInterpolation_VERSION_PATCH} )
99
10- set (CMAKE_CXX_STANDARD 17 )
10+ set (CMAKE_CXX_STANDARD 14 )
1111
1212include (${CMAKE_BINARY_DIR} /conanbuildinfo.cmake)
1313conan_basic_setup(TARGETS)
Original file line number Diff line number Diff line change 11target_sources (CubicInterpolation PRIVATE
2- Axis.cxx
3- BicubicSplines.cxx
4- CubicSplines.cxx
5- InterpolantBuilder.cxx
6- Interpolant.cxx
2+ ${CMAKE_CURRENT_LIST_DIR} / Axis.cxx
3+ ${CMAKE_CURRENT_LIST_DIR} / BicubicSplines.cxx
4+ ${CMAKE_CURRENT_LIST_DIR} / CubicSplines.cxx
5+ ${CMAKE_CURRENT_LIST_DIR} / InterpolantBuilder.cxx
6+ ${CMAKE_CURRENT_LIST_DIR} / Interpolant.cxx
77 )
Original file line number Diff line number Diff line change @@ -4,23 +4,22 @@ include(GoogleTest)
44
55find_package (GTest REQUIRED)
66
7- set (TestingLibs
7+ set (Libs
88 CubicInterpolation::CubicInterpolation
9- GTest::GTest
10- )
9+ GTest::GTest)
1110
1211# add_executable(TestAxis TestAxis.cpp)
1312# target_link_libraries(TestAxis PRIVATE gtest CubicInterpolation)
1413# gtest_discover_tests(TestAxis)
1514
1615add_executable (TestCubicSplines TestCubicSplines.cpp)
17- target_link_libraries (TestCubicSplines ${TestingLibs } )
16+ target_link_libraries (TestCubicSplines ${Libs } )
1817gtest_discover_tests(TestCubicSplines)
1918
2019add_executable (TestBicubicSplines TestBicubicSplines.cpp)
21- target_link_libraries (TestBicubicSplines ${TestingLibs } )
20+ target_link_libraries (TestBicubicSplines ${Libs } )
2221gtest_discover_tests(TestBicubicSplines)
2322
2423add_executable (TestFindParameter TestFindParameter.cpp)
25- target_link_libraries (TestFindParameter ${TestingLibs } )
24+ target_link_libraries (TestFindParameter ${Libs } )
2625gtest_discover_tests(TestFindParameter)
You can’t perform that action at this time.
0 commit comments