From 6d5be6be0e788eccda9057f4a6f14ab60ce5640f Mon Sep 17 00:00:00 2001 From: petrucianno Date: Mon, 25 Jan 2021 00:55:12 +0200 Subject: [PATCH 1/7] Updated CXX standard --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5001c1..33e958a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) # project name and supported languages -project(example Fortran C CXX) +project(example) + +set(CMAKE_CXX_STANDARD 14) # guard against in-source builds and bad build-type strings include(cmake/safeguards.cmake) From 7c3c7ab9f7b0a9b36fb968b4d9be24e494ce8d8f Mon Sep 17 00:00:00 2001 From: petrucianno Date: Mon, 25 Jan 2021 01:48:40 +0200 Subject: [PATCH 2/7] Update example_add.cpp --- test/example_add.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/example_add.cpp b/test/example_add.cpp index 57910dd..26e0e3a 100644 --- a/test/example_add.cpp +++ b/test/example_add.cpp @@ -7,3 +7,9 @@ TEST(example, add) res = add_numbers(1.0, 2.0); ASSERT_NEAR(res, 3.0, 1.0e-11); } + +TEST(example, add) +{ + auto res = add_numbers(1000, 1000); + ASSERT_NEAR(res, 2000.0, 1.0e-11); +} From 6e575eb2df1354083e397ad618f29695202f235d Mon Sep 17 00:00:00 2001 From: petrucianno Date: Mon, 25 Jan 2021 01:51:50 +0200 Subject: [PATCH 3/7] Update example_add.cpp --- test/example_add.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/example_add.cpp b/test/example_add.cpp index 26e0e3a..06df14f 100644 --- a/test/example_add.cpp +++ b/test/example_add.cpp @@ -8,7 +8,7 @@ TEST(example, add) ASSERT_NEAR(res, 3.0, 1.0e-11); } -TEST(example, add) +TEST(example, add_another) { auto res = add_numbers(1000, 1000); ASSERT_NEAR(res, 2000.0, 1.0e-11); From 34686da040222e6b1d369f7f3437842d0c369795 Mon Sep 17 00:00:00 2001 From: petrucianno Date: Mon, 25 Jan 2021 11:18:37 +0200 Subject: [PATCH 4/7] CMakeLists.txt - remove Fortran, update .gitignore --- .gitignore | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a5309e6..468d90c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build*/ +*build*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 33e958a..19da404 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ add_subdirectory(src) # set cdash buildname set(BUILDNAME - "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_Fortran_COMPILER_ID}-${cmake_build_type_tolower}" + "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}-${cmake_build_type_tolower}" CACHE STRING "Name of build on the dashboard" ) From 032e0de1fbf408b3ae18b91424636ccdd0a6f2e0 Mon Sep 17 00:00:00 2001 From: petrucianno Date: Wed, 3 Feb 2021 01:13:28 +0200 Subject: [PATCH 5/7] Made it to work with MSVC --- cmake/googletest-download.cmake | 2 +- test/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake index 4926683..0ec4d55 100644 --- a/cmake/googletest-download.cmake +++ b/cmake/googletest-download.cmake @@ -12,7 +12,7 @@ ExternalProject_Add( GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG - release-1.8.0 + release-1.10.0 CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0e239b3..da2eb72 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,5 @@ +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + add_executable( unit_tests example_add.cpp From 1ed30662f330a7fc335f9f36f6f8525a153ef370 Mon Sep 17 00:00:00 2001 From: petrucianno Date: Wed, 3 Feb 2021 02:00:51 +0200 Subject: [PATCH 6/7] Run GTest with MSVC --- CMakeLists.txt | 1 + CTestConfig.cmake | 7 ------- test/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 CTestConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 19da404..16afba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,7 @@ set(BUILDNAME include(CTest) # fetch googletest +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) include(cmake/googletest.cmake) fetch_googletest( ${PROJECT_SOURCE_DIR}/cmake diff --git a/CTestConfig.cmake b/CTestConfig.cmake deleted file mode 100644 index 196d89c..0000000 --- a/CTestConfig.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CTEST_PROJECT_NAME "cmake-example") -set(CTEST_NIGHTLY_START_TIME "00:00:00 CEST") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=cmake-example") -set(CTEST_DROP_SITE_CDASH TRUE) -set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 200) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index da2eb72..0e239b3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,3 @@ -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - add_executable( unit_tests example_add.cpp From 9b1fd38b005d1be1bc9e26135f6e1b7f089e377b Mon Sep 17 00:00:00 2001 From: petrucianno Date: Thu, 4 Feb 2021 20:28:36 +0200 Subject: [PATCH 7/7] Removed unnecesary components, updated .gitignore --- .gitignore | 1 + CMakeLists.txt | 12 ------------ cmake/googletest-download.cmake | 2 -- cmake/packaging.cmake | 5 ----- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 cmake/packaging.cmake diff --git a/.gitignore b/.gitignore index 468d90c..afe608f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *build*/ +.* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 16afba7..a34a69f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,16 +43,6 @@ configure_file( add_subdirectory(src) -# set cdash buildname -set(BUILDNAME - "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}-${cmake_build_type_tolower}" - CACHE STRING - "Name of build on the dashboard" - ) - -# allow to report to a cdash dashboard -include(CTest) - # fetch googletest set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) include(cmake/googletest.cmake) @@ -67,5 +57,3 @@ enable_testing() # define tests add_subdirectory(test) -# cpack -include(cmake/packaging.cmake) diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake index 0ec4d55..ebd7a79 100644 --- a/cmake/googletest-download.cmake +++ b/cmake/googletest-download.cmake @@ -11,8 +11,6 @@ ExternalProject_Add( BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build" GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG - release-1.10.0 CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake deleted file mode 100644 index a2dbdbb..0000000 --- a/cmake/packaging.cmake +++ /dev/null @@ -1,5 +0,0 @@ -include(InstallRequiredSystemLibraries) - -set(CPACK_PACKAGE_CONTACT "Kilgore Trout") - -include(CPack)