- adds gridgen test

CMakeLists.txt

@@ -97,6 +97,7 @@ add_subdirectory(targets/libs/GridGenerator)
 set(BUILD_TESTS ON CACHE BOOL "Build shared libraries")
 if(BUILD_TESTS)
   add_subdirectory(3rdParty/googletest)
+  add_subdirectory(targets/tests/GridGeneratorTest)
   #add_subdirectory(targets/tests/VirtualFluidsTest)
   add_subdirectory(targets/tests/VirtualFluidsBasicsTest)
 endif()

targets/tests/GridGeneratorTest/3rdPartyLinking.cmake

@@ -5,4 +5,4 @@ linkMPI(${targetName})
 include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
 linkCuda(${targetName})
 include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName})
+linkBoost(${targetName} "")
\ No newline at end of file

targets/tests/GridGeneratorTest/CMakeLists.txt

@@ -2,7 +2,7 @@ setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
 
 set(linkDirectories "")
 set(libsToLink GridGenerator)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
+set(includeDirectories ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/GridGenerator)
 
 #glob files and save in MY_SRCS
 include(CMakePackage.cmake)

targets/tests/GridGeneratorTest/CMakePackage.cmake

@@ -5,4 +5,4 @@ addCAndCPPFileTypes()
 #GLOB SOURCE FILES IN MY_SRCS
 unset(MY_SRCS)
 includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(GridGenerator ${PROJECT_SOURCE_DIR}/src)
+includeRecursiveTestFilesFrom(GridGenerator ${CMAKE_SOURCE_DIR}/src/GridGenerator)

targets/tests/Input.Test/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-linkJsonCpp(${targetName})
\ No newline at end of file

targets/tests/Input.Test/CMakeLists.txt

-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink Input)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)

targets/tests/Input.Test/CMakePackage.cmake

-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(Input ${PROJECT_SOURCE_DIR}/src)

targets/tests/Input.Test/main.cpp

-#include "gmock/gmock.h"
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}

targets/tests/Logger.Test/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-

targets/tests/Logger.Test/CMakeLists.txt

-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink Logger)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)

targets/tests/Logger.Test/CMakePackage.cmake

-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(Logger ${PROJECT_SOURCE_DIR}/src)

targets/tests/Logger.Test/main.cpp

-#include "gmock/gmock.h"
-
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
-

targets/tests/utilities.Test/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-

targets/tests/utilities.Test/CMakeLists.txt

-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink utilities)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)

targets/tests/utilities.Test/CMakePackage.cmake

-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(utilities ${PROJECT_SOURCE_DIR}/src)

targets/tests/utilities.Test/main.cpp

-#include "gmock/gmock.h"
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
-