Review configure setup

Author: scheibel

.gitignore

@@ -39,4 +39,5 @@ build/
 
 # build directories
 build
+*-build*
 build-*

cmake/Findgoogletest.cmake

@@ -0,0 +1,28 @@
+
+# googletest_FOUND
+# Target googletest::googletest
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig)
+pkg_search_module(GMOCK QUIET gmock_main)
+
+find_package_handle_standard_args(googletest REQUIRED_VARS GMOCK_CFLAGS GMOCK_LDFLAGS)
+mark_as_advanced(GMOCK_CFLAGS GMOCK_LDFLAGS)
+
+if (googletest_FOUND)
+    
+    
+    # Create interface library to link against gmock
+    add_library(googletest::googletest INTERFACE IMPORTED)
+
+    target_link_libraries(googletest::googletest
+        INTERFACE
+        ${GMOCK_LDFLAGS}
+    )
+
+    target_compile_options(googletest::googletest
+        INTERFACE
+        ${GMOCK_CFLAGS}
+    )
+endif ()

configure

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Default options
+
 BUILD_DIR="build"
 CMAKE_GENERATOR="Unix Makefiles"
 BUILD_TYPE="Release"
@@ -99,19 +100,33 @@ do
     fi
 done
 
+if [ "$CMAKE_GENERATOR_OVERRIDE" != "" ]
+then
+  echo "Override CMAKE_GENERATOR to $CMAKE_GENERATOR_OVERRIDE"
+  CMAKE_GENERATOR="$CMAKE_GENERATOR_OVERRIDE"
+fi
+
+if [ -n "$BUILD_DIR_PREFIX" ]; then
+  BUILD_DIR="${BUILD_DIR_PREFIX}-${BUILD_DIR}"
+fi
+
 # Configure build
-echo "Configuring ..."
+echo "Configuring in \"$BUILD_DIR\""
 echo ""
 
 # Create build directory
-if [ ! -d "./$BUILD_DIR" ]
+if [ ! -d "$BUILD_DIR" ]
 then
-    mkdir $BUILD_DIR
+    mkdir -p "$BUILD_DIR"
 fi
 
 # Configure project
-cd $BUILD_DIR
-cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS ..
+
+PREVIOUS_DIR=$(pwd)
+
+pushd $BUILD_DIR
+echo cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS "$PREVIOUS_DIR"
+cmake -G "$CMAKE_GENERATOR" "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" $CMAKE_OPTIONS "$PREVIOUS_DIR"
 if [ $? == 0 ]
 then
     echo ""
@@ -122,5 +137,4 @@ else
     echo ""
     echo "Configuration failed.";
 fi
-
-cd ..
+popd

source/tests/CMakeLists.txt

@@ -13,11 +13,9 @@ set(META_PROJECT_NAME "glkernel")
 project("${META_PROJECT_NAME}-tests" C CXX)
 
 # Set policies
-set_policy(CMP0028 NEW) # ENABLE  CMP0028: Double colon in target name means ALIAS or IMPORTED target.
 set_policy(CMP0054 NEW) # ENABLE  CMP0054: Only interpret if() arguments as variables or keywords when unquoted.
 set_policy(CMP0042 NEW) # ENABLE  CMP0042: MACOSX_RPATH is enabled by default.
 set_policy(CMP0063 NEW) # ENABLE  CMP0063: Honor visibility properties for all target types.
-set_policy(CMP0037 OLD) # DISABLE CMP0037: Target names should not be reserved and should match a validity pattern.
 
 # Compiler settings and options
 
@@ -41,40 +39,31 @@ function(add_test_without_ctest target)
 
     add_dependencies(test ${target})
     add_custom_command(TARGET test POST_BUILD 
-        COMMAND $<TARGET_FILE:${target}> --gtest_output=xml:gtests-${target}.xml)
+        COMMAND $<TARGET_FILE:${target}> --gtest_output=xml:gtests-${target}.xml
+    )
 endfunction()
 
-# Build gmock
-set(gmock_build_tests           OFF CACHE BOOL "")
-set(gtest_build_samples         OFF CACHE BOOL "")
-set(gtest_build_tests           OFF CACHE BOOL "")
-set(gtest_disable_pthreads      OFF CACHE BOOL "")
-set(gtest_force_shared_crt      ON  CACHE BOOL "")
-set(gtest_hide_internal_symbols OFF CACHE BOOL "")
-
-add_subdirectory(googletest/googlemock)
-
-# Create interface library to link against gmock
-add_library(gmock-dev INTERFACE)
-
-target_include_directories(gmock-dev
-    SYSTEM INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googlemock/include
-)
-
-target_link_libraries(gmock-dev
-    INTERFACE
-    gmock
-)
+find_package(googletest QUIET)
 
+if (NOT TARGET googletest::googletest)
+    message(STATUS "Tests skipped: googletest not found")
+    return()
+endif ()
 
 # 
 # Target 'test'
 # 
 
-add_custom_target(test)
-set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+if (${CMAKE_VERSION} VERSION_LESS "3.11")
+    set_policy(CMP0037 OLD) # DISABLE CMP0037: Target names should be reserved and should match a validity pattern.
+    add_custom_target(test)
+    set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+else ()
+    if (NOT TARGET test)
+        add_custom_target(test)
+        set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+    endif()
+endif ()
 
 
 # 

source/tests/glkernel-test/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 find_package(${META_PROJECT_NAME} REQUIRED HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../")
 
-find_package(glm REQUIRED)
+find_package(glm CONFIG REQUIRED)
 find_package(OpenMP QUIET)
 
 # 
@@ -71,7 +71,6 @@ set_target_properties(${target}
 target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
-    ${GLM_INCLUDE_DIR}
     ${PROJECT_BINARY_DIR}/source/include
 )
 
@@ -84,7 +83,8 @@ target_link_libraries(${target}
     PRIVATE
     ${DEFAULT_LIBRARIES}
     ${META_PROJECT_NAME}::glkernel
-    gmock-dev
+    glm::glm
+    googletest::googletest
 )