CMake: extensions/ -> commons/ and find/

CMakeLists.txt

@@ -4,13 +4,10 @@
 
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake/extensions # CMake modules for use in various projects
-    ${CMAKE_SOURCE_DIR}/cmake/
-    )
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/find)
 set(CONFIGURABLES_DIR ${CMAKE_SOURCE_DIR}/cmake/configurables)
 
-include(PreventInSourceBuilds)
+include(commons/PreventInSourceBuilds)
 
 project(BornAgain
     VERSION 1.17.99
@@ -74,7 +71,7 @@ elseif(WIN32)
     include(BornAgain/Windows)
 endif()
 
-include(GetFilenameComponent) # overwrite CMake command
+include(commons/GetFilenameComponent) # overwrite CMake command
 include(BornAgain/Directories)
 include(BornAgain/Compiler)
 include(BornAgain/Dependences)
@@ -91,12 +88,12 @@ include(BornAgain/LineLength)
 
 # debug optimization
 if(BORNAGAIN_DEBUG_OPTIMIZATION)
-  include(DebugOptimization)
+  include(commons/DebugOptimization)
 endif()
 
 # code coverage analysis
 if(BORNAGAIN_COVERAGE)
-  include(CoverageFunction)
+  include(commons/CoverageFunction)
   include(BornAgain/Coverage)
 endif()
 

cmake/extensions/AssertLibraryFunction.cmake → cmake/commons/AssertLibraryFunction.cmake

@@ -43,7 +43,7 @@
 #   include(FindPackageHandleStandardArgs)
 #   find_package_handle_standard_args(<Package> DEFAULT_MSG <Package>_LIBRARIES <Package>_INCLUDE_DIR)
 #   
-#   include(AssertLibraryFunction)
+#   include(commons/AssertLibraryFunction)
 #   assert_library_function(<Package> <function_name> "")
 #   
 #   mark_as_advanced(<Package>_INCLUDE_DIR <Package>_LIBRARIES)

cmake/extensions/GlobDirectories.cmake

-MACRO(GLOB_DIRECTORIES result)
-    FILE(GLOB children RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
-    SET(dirlist "")
-    FOREACH(child ${children})
-        IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${child})
-            LIST(APPEND dirlist ${child})
-        ENDIF()
-    ENDFOREACH()
-    SET(${result} ${dirlist})
-ENDMACRO()

cmake/extensions/FindCerf.cmake → cmake/find/FindCerf.cmake

@@ -29,7 +29,7 @@ endif()
 
 mark_as_advanced(Cerf_INCLUDE_DIR Cerf_LIBRARIES)
 
-include(AssertLibraryFunction)
+include(commons/AssertLibraryFunction)
 assert_library_function(Cerf cerf "")
 assert_library_function(Cerf dawson "")
 assert_library_function(Cerf voigt "")