Merge pull request #38 from umr-dbs/test-fix

Test Fix

Author: michaelmattig

CMakeLists.txt

@@ -5,6 +5,7 @@ project(mapping_core
 
 # CMake Settings
 cmake_minimum_required(VERSION 3.7)
+cmake_policy(SET CMP0079 NEW)
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 ## Debug
@@ -47,8 +48,15 @@ download_project(PROJ       cpptoml
         )
 add_subdirectory(${cpptoml_SOURCE_DIR} ${cpptoml_BINARY_DIR} EXCLUDE_FROM_ALL)
 
+# Modules
+set(MAPPING_CORE_PATH ${CMAKE_SOURCE_DIR} CACHE PATH "This is the mapping-core directory." FORCE)
+foreach (mapping_module IN ITEMS ${MAPPING_MODULES})
+    message(STATUS "Loading Module `${mapping_module}`")
+    add_subdirectory(${MAPPING_MODULE_PATH}/${mapping_module} target/modules/${mapping_module})
+endforeach (mapping_module)
+
 add_subdirectory(src)
 
 include(CTest)
 enable_testing()
-add_subdirectory(test)
+add_subdirectory(test)

src/CMakeLists.txt

@@ -290,12 +290,6 @@ find_package(Fcgi++ REQUIRED)
 target_link_libraries(mapping_core_services_lib ${Fcgi++_LIBRARIES})
 target_include_directories(mapping_core_services_lib PRIVATE ${Fcgi++_INCLUDE_DIRS})
 
-# Modules
-set(MAPPING_CORE_PATH ${CMAKE_SOURCE_DIR} CACHE PATH "This is the mapping-core directory." FORCE)
-foreach (mapping_module IN ITEMS ${MAPPING_MODULES})
-    message(STATUS "Loading Module `${mapping_module}`")
-    add_subdirectory(../${MAPPING_MODULE_PATH}/${mapping_module} target/modules/${mapping_module})
-endforeach (mapping_module)
 ## Base
 foreach (mapping_core_addition IN ITEMS ${MAPPING_ADD_TO_BASE_OBJECTS})
     message(STATUS "Adding ${mapping_core_addition} to base.")

test/CMakeLists.txt

@@ -57,6 +57,15 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
 target_link_libraries(mapping_core_unittests_lib gtest)
 
+
+foreach (mapping_test_addition IN ITEMS ${MAPPING_ADD_TO_UNITTESTS_LIBRARIES_INTERNAL})
+    message(STATUS "Adding ${mapping_test_addition} to tests.")
+    # Provide dependencies to foreign test library
+    target_link_libraries_internal(${mapping_test_addition} mapping_core_unittests_lib)
+    # Append foregin tests to unit tests
+    target_link_libraries_internal(mapping_unittests ${mapping_test_addition})
+endforeach(mapping_test_addition)
+
 # Define the build of the test executables as one of the tests s.t. they are built on `make test`
 # TODO: use multiple threads for building
 add_test(NAME build_mapping_unittests COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR}