split directory: generic CMake modules vs BornAgain-specific CMake modules

CMakeLists.txt

@@ -26,7 +26,8 @@ option(BORNAGAIN_CRASHHANDLER "Additional machinery to send crash reports" OFF)
 option(BORNAGAIN_TIFF_SUPPORT "Tiff files read/write support" ON)
 
 #--- Include CMake macros and functions ---
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+set(CMAKE_MODULE_PATH
+    ${CMAKE_SOURCE_DIR}/cmake/generic-modules ${CMAKE_SOURCE_DIR}/cmake/bornagain-modules)
 include(GetFilenameComponent) # overwrite CMake command
 include(BornAgainMacros)
 include(SearchInstalledSoftware)

cmake/modules/UnitTests.cmake → cmake/bornagain-modules/UnitTests.cmake

@@ -23,12 +23,12 @@ function(UNIT_TESTS TEST_NAME SUBDIR LINK_LIB)
 
     # Compose main program (C++ snippets plus #include's of test code from SUBDIR)
     set(TMP "/* Generated by CMake. Do not edit. Do not put under version control. */\n")
-    file(READ "${CMAKE_MODULE_PATH}/unitTests.cpp.header" TMPTMP)
+    file(READ "${CMAKE_SOURCE_DIR}/cmake/scripts/unitTests.cpp.header" TMPTMP)
     set(TMP "${TMP}\n${TMPTMP}\n")
     foreach(FILE ${INCLUDE_FILES})
         set(TMP "${TMP}#include \"${CMAKE_CURRENT_SOURCE_DIR}/${FILE}\"\n")
     endforeach()
-    file(READ "${CMAKE_MODULE_PATH}/unitTests.cpp.footer" TMPTMP)
+    file(READ "${CMAKE_SOURCE_DIR}/cmake/scripts/unitTests.cpp.footer" TMPTMP)
     set(TMP "${TMP}\n${TMPTMP}")
 
     set(TEST_SRC "${BUILD_AUTO_DIR}/${TEST_NAME}.cpp")