Handle linking and header search paths in add_mocked_test

#251

cmake/Testing.cmake

@@ -240,12 +240,6 @@ macro(add_mocked_test cpp_file)
   add_dependencies(${cpp_file} phoenix) # TODO: is this really needed?
 
  
-  # make shure linker dependency injection works
-  target_include_directories(${cpp_file}
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
-    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
   get_target_property(phoenix_link_libraries phoenix LINK_LIBRARIES)
 
   if(${ADD_MOCKED_TEST_MOCK_GLEW})
@@ -258,7 +252,9 @@ macro(add_mocked_test cpp_file)
     foreach(LIBRARY_TO_BE_ADDED ${LIBRARIES_TO_BE_ADDED})
       list(APPEND phoenix_link_libraries ${LIBRARY_TO_BE_ADDED})
     endforeach()
-    list(APPEND phoenix_link_libraries opengl_mock)
+
+    target_link_libraries(${cpp_file} opengl_mock)
+    target_include_directories(${cpp_file} PRIVATE opengl_mock)
   endif(${ADD_MOCKED_TEST_MOCK_GLEW})
 
   if(${ADD_MOCKED_TEST_MOCK_SDL})
@@ -271,7 +267,9 @@ macro(add_mocked_test cpp_file)
     foreach(LIBRARY_TO_BE_ADDED ${LIBRARIES_TO_BE_ADDED})
       list(APPEND phoenix_link_libraries ${LIBRARY_TO_BE_ADDED})
     endforeach()
-    list(APPEND phoenix_link_libraries sdl_mock)
+    
+    target_link_libraries(${cpp_file} sdl_mock)
+    target_include_directories(${cpp_file} PRIVATE sdl_mock)
   endif(${ADD_MOCKED_TEST_MOCK_SDL})
 
   if(${ADD_MOCKED_TEST_MOCK_OPENVR})
@@ -284,7 +282,9 @@ macro(add_mocked_test cpp_file)
     foreach(LIBRARY_TO_BE_ADDED ${LIBRARIES_TO_BE_ADDED})
       list(APPEND phoenix_link_libraries ${LIBRARY_TO_BE_ADDED})
     endforeach()
-    list(APPEND phoenix_link_libraries openvr_mock)
+
+    target_link_libraries(${cpp_file} openvr_mock)
+    target_include_directories(${cpp_file} PRIVATE openvr_mock)
   endif(${ADD_MOCKED_TEST_MOCK_OPENVR})
 
   target_link_libraries(${cpp_file}

tests/CMakeLists.txt

@@ -104,7 +104,8 @@ add_mock(
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/mocks/opengl_mock.cpp
   HEADERS ${CMAKE_CURRENT_BINARY_DIR}/mocks/opengl_mock.hpp
   INCLUDE_DIRECTORIES
-    ${OPENGL_MOCK_SOURCE}
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
   INCLUDE_DIRECTORIES_OF
     phoenix
     ${CONAN_OR_CMAKE_gl}
@@ -125,7 +126,7 @@ add_mock(
   HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks/openvr_mock.hpp
   INCLUDE_DIRECTORIES
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/mocks
+    ${CMAKE_CURRENT_BINARY_DIR}
   INCLUDE_DIRECTORIES_OF
     phoenix
     ${CONAN_OR_CMAKE_openvr}
@@ -138,6 +139,7 @@ add_mock(
   HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks/sdl_mock.hpp
   INCLUDE_DIRECTORIES
     ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
   INCLUDE_DIRECTORIES_OF
     phoenix
     ${CONAN_OR_CMAKE_sdl2}

tests/src/mocks/openvr_mock.hpp

@@ -36,7 +36,7 @@ SUPPRESS_WARNINGS_BEGIN
 #include "trompeloeil.hpp"
 SUPPRESS_WARNINGS_END
 
-#include "openvr_mock_export.hpp"
+#include "mocks/openvr_mock_export.hpp"
 
 using trompeloeil::_;