diff --git a/.gitignore b/.gitignore index a5309e6..afe608f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -build*/ +*build*/ +.* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index f5001c1..a34a69f 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) @@ -41,17 +43,8 @@ configure_file( add_subdirectory(src) -# set cdash buildname -set(BUILDNAME - "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_Fortran_COMPILER_ID}-${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) fetch_googletest( ${PROJECT_SOURCE_DIR}/cmake @@ -64,5 +57,3 @@ enable_testing() # define tests add_subdirectory(test) -# cpack -include(cmake/packaging.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/cmake/googletest-download.cmake b/cmake/googletest-download.cmake index 4926683..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.8.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) diff --git a/test/example_add.cpp b/test/example_add.cpp index 57910dd..06df14f 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_another) +{ + auto res = add_numbers(1000, 1000); + ASSERT_NEAR(res, 2000.0, 1.0e-11); +}