Move add_mock_lib to add_mock into Testing.cmake, use named params

#250, #251

cmake/Testing.cmake

@@ -155,7 +155,6 @@ function(CONFIGURE_TEST_)
 endfunction()
 
 
-
 function(TESTING__SET_TIMEOUT_ TARGET)
   if(NOT ${TARGET} MATCHES "integration")
     set_tests_properties(${TARGET} PROPERTIES TIMEOUT 10.0)
@@ -165,6 +164,26 @@ function(TESTING__SET_TIMEOUT_ TARGET)
 endfunction()
 
 
+macro(ADD_MOCK)#mock_name mock_src_path)
+  set(options )
+  set(oneValueArgs NAME)
+  set(multiValueArgs SOURCES HEADERS)
+  cmake_parse_arguments(ADD_MOCK_
+    "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  
+  add_library(${ADD_MOCK__NAME} SHARED
+    ${ADD_MOCK__SOURCES}
+    ${ADD_MOCK__HEADERS}
+  )
+  target_link_libraries(${ADD_MOCK__NAME}
+    ${CONAN_OR_CMAKE_trompeloeil})
+  #phx include dirs needed for suppress_warnings.hpp
+  target_include_directories(${ADD_MOCK__NAME}
+    PRIVATE ${phoenix_include_directories})
+  set_property(TARGET ${ADD_MOCK__NAME} PROPERTY FOLDER "Tests")
+  set_warning_levels_rwth(${ADD_MOCK__NAME})
+endmacro()
+
 
 
 #-------------------------------------------------------------------------------

tests/CMakeLists.txt

@@ -56,19 +56,7 @@ get_target_property(gl_include_directories
   ${CONAN_OR_CMAKE_gl} INTERFACE_INCLUDE_DIRECTORIES)
 
 
-macro(add_mock_lib mock_name mock_src_path)
-  add_library(${mock_name} SHARED
-    ${mock_src_path}/${mock_name}.cpp
-    ${mock_src_path}/${mock_name}.hpp
-  )
-  target_link_libraries(${mock_name}
-    ${CONAN_OR_CMAKE_trompeloeil})
-  #phx include dirs needed for suppress_warnings.hpp
-  target_include_directories(${mock_name}
-    PRIVATE ${phoenix_include_directories})
-  set_property(TARGET ${mock_name} PROPERTY FOLDER "Tests")
-  set_warning_levels_rwth(${mock_name})
-endmacro()
+
 
 # generate opengl_mock
 set( OPENGL_MOCK_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mocks)
@@ -84,7 +72,12 @@ if( NOT EXISTS ${OPENGL_MOCK_SOURCE}/opengl_mock.cpp OR
     -t "${CMAKE_CURRENT_SOURCE_DIR}/src/mocks/generation/")
 endif()
 
-add_mock_lib(opengl_mock ${OPENGL_MOCK_SOURCE})
+add_mock(
+  NAME opengl_mock
+  SOURCES ${CMAKE_CURRENT_BINARY_DIR}/mocks/opengl_mock.cpp
+  HEADERS ${CMAKE_CURRENT_BINARY_DIR}/mocks/opengl_mock.hpp
+  )
+#add_mock_lib(opengl_mock ${OPENGL_MOCK_SOURCE})
 target_include_directories(opengl_mock
   PUBLIC ${OPENGL_MOCK_SOURCE}
   PUBLIC ${glew_include_directories})
@@ -95,7 +88,12 @@ generate_export_header(opengl_mock
 )
 
 # generate openvr_mock
-add_mock_lib(openvr_mock ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks)
+add_mock(
+  NAME openvr_mock
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks/openvr_mock.cpp
+  HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks/openvr_mock.hpp
+  )
+#add_mock_lib(openvr_mock ${CMAKE_CURRENT_SOURCE_DIR}/src/mocks)
 target_include_directories(openvr_mock
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
   PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/mocks