Move gtest to external/upstream, almost working...

Author: robertodr

CMakeLists.txt

@@ -29,6 +29,7 @@ include(Clang.CXX)
 include(autocmake_custom_color_messages)
 include(autocmake_python_interpreter)
 include(autocmake_ccache)
+include(numgrid)
 include(api)
 include(GNUdirs)
 include(include_paths)

api/CMakeLists.txt

@@ -1,9 +1,9 @@
 install(FILES ${PROJECT_SOURCE_DIR}/api/numgrid.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
+message(STATUS "numgrid Fortran bindings ${BoldBlue}${ENABLE_FC_SUPPORT}${ColourReset}")
 if(ENABLE_FC_SUPPORT)
   add_library(numgrid_fortran OBJECT ${PROJECT_SOURCE_DIR}/api/numgrid.f90)
   set_target_properties(numgrid_fortran PROPERTIES INCLUDE_DIRECTORIES ""
     POSITION_INDEPENDENT_CODE 1
     )
-  message(STATUS "${BoldBlue}numgrid Fortran bindings ENABLED${ColourReset}")
 endif()

cmake/autocmake.yml

@@ -23,6 +23,7 @@ modules:
     - '%(url_root)modules/custom_color_messages.cmake'
     - '%(url_root)modules/python_interpreter.cmake'
     - '%(url_root)modules/ccache.cmake'
+    - 'custom/numgrid.cmake'
     - 'custom/api.cmake'
     - 'custom/GNUdirs.cmake'
     - 'custom/include_paths.cmake'

cmake/custom/numgrid.cmake

@@ -0,0 +1,3 @@
+option(ENABLE_UNIT_TESTS "Enable unit tests" ON)
+message(STATUS "Unit tests ${BoldBlue}${ENABLE_UNIT_TESTS}${ColourReset}")
+

cmake/custom/test.cmake

@@ -1,55 +1,7 @@
-option(ENABLE_UNIT_TESTS "Enable unit tests" ON)
-message(STATUS "Enable testing: ${ENABLE_UNIT_TESTS}")
-
 if(ENABLE_UNIT_TESTS)
-    include(CTest)
-    enable_testing()
-
-    include(ExternalProject)
-
-    ExternalProject_Add(
-        gtest
-        PREFIX "${PROJECT_BINARY_DIR}/gtest"
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG master
-        INSTALL_COMMAND true  # currently no install command
-        )
-
-    include_directories(${PROJECT_BINARY_DIR}/gtest/src/gtest/googletest/include)
-    include_directories(${PROJECT_SOURCE_DIR}/src)
-
-    link_directories(${PROJECT_BINARY_DIR}/gtest/src/gtest-build/googlemock/gtest/)
-
-    add_executable(
-        cpp_test
-        test/main.cpp
-        test/test.cpp
-        )
-
-    add_dependencies(cpp_test gtest)
-
-    target_link_libraries(
-        cpp_test
-        libgtest.a
-        numgrid
-        pthread
-        )
-
-    add_test(cpp_test ${PROJECT_BINARY_DIR}/bin/cpp_test)
-
-    if(ENABLE_FC_SUPPORT)
-        add_executable(
-            fortran_test
-            test/test.f90
-            )
-
-        add_dependencies(fortran_test gtest)
-
-        target_link_libraries(
-            fortran_test
-            numgrid
-            )
+  include(CTest)
+  enable_testing()
+  find_package(Threads REQUIRED)
 
-        add_test(fortran_test ${PROJECT_BINARY_DIR}/bin/fortran_test)
-    endif()
+  add_subdirectory(test)
 endif()

external/upstream/CMakeLists.txt

@@ -1,5 +1,5 @@
 foreach(dir lebedev
-    #            gtest
+            gtest
 )
    add_subdirectory(${dir})
 endforeach()

external/upstream/gtest/CMakeLists.txt

@@ -0,0 +1,11 @@
+if(ENABLE_UNIT_TESTS)
+  include(ExternalProject)
+
+  ExternalProject_Add(
+    gtest
+    PREFIX ${PROJECT_BINARY_DIR}/external/upstream/gtest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG master
+    INSTALL_COMMAND ""
+    )
+endif()

test/CMakeLists.txt

@@ -0,0 +1,39 @@
+set(gtest_ROOT ${PROJECT_BINARY_DIR}/external/upstream/gtest)
+set(gtest_SOURCE_DIR ${gtest_ROOT}/src/gtest/googletest)
+set(gtest_BINARY_DIR ${gtest_ROOT}/src/gtest-build/googlemock/gtest)
+
+include_directories(${gtest_SOURCE_DIR}/include)
+link_directories(${gtest_BINARY_DIR})
+
+add_executable(
+  cpp_test
+  main.cpp
+  test.cpp
+  )
+
+add_dependencies(cpp_test gtest)
+
+target_link_libraries(
+  cpp_test
+  numgrid
+  libgtest.a
+  Threads::Threads
+  )
+
+add_test(cpp_test ${PROJECT_BINARY_DIR}/bin/cpp_test)
+
+if(ENABLE_FC_SUPPORT)
+  add_executable(
+    fortran_test
+    test.f90
+    )
+
+  add_dependencies(fortran_test gtest)
+
+  target_link_libraries(
+    fortran_test
+    numgrid
+    )
+
+  add_test(fortran_test ${PROJECT_BINARY_DIR}/bin/fortran_test)
+endif()