CMake: include files with path BornAgain/*

to avoid ambiguities while allowing for concise file names

CMakeLists.txt

@@ -5,8 +5,8 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake/modules    # CMake modules specific for BornAgain
     ${CMAKE_SOURCE_DIR}/cmake/extensions # CMake modules for use in various projects
+    ${CMAKE_SOURCE_DIR}/cmake/
     )
 set(CONFIGURABLES_DIR ${CMAKE_SOURCE_DIR}/cmake/configurables)
 
@@ -64,20 +64,30 @@ if(ALLCONFIG)
 endif()
 
 # include CMake macros and functions
+#--- Setup details depending on the major platform type ---
+
+if(CMAKE_SYSTEM_NAME MATCHES Linux)
+    include(BornAgain/Linux)
+elseif(APPLE)
+    include(BornAgain/MacOS)
+elseif(WIN32)
+    include(BornAgain/Windows)
+endif()
+
 include(GetFilenameComponent) # overwrite CMake command
-include(Directories)
-include(CheckCompiler)
-include(Dependences)
+include(BornAgain/Directories)
+include(BornAgain/Compiler)
+include(BornAgain/Dependences)
 if(ZERO_TOLERANCE)
     string(APPEND CMAKE_CXX_FLAGS " -Werror -Wfatal-errors")
 endif()
 if(BORNAGAIN_GUI)
-    include(SearchQt)
+    include(BornAgain/Qt)
     string(APPEND CMAKE_CXX_FLAGS " -DHAVE_QT=ON")
 endif()
-include(BornAgainConfiguration)
-include(GeneratePythonDocs)
-include(BALineLength)
+include(BornAgain/Config)
+include(BornAgain/PythonDocs)
+include(BornAgain/LineLength)
 
 # debug optimization
 if(BORNAGAIN_DEBUG_OPTIMIZATION)
@@ -87,7 +97,7 @@ endif()
 # code coverage analysis
 if(BORNAGAIN_COVERAGE)
   include(CoverageFunction)
-  include(BACoverage)
+  include(BornAgain/Coverage)
 endif()
 
 # recurse into the given subdirectories
@@ -133,4 +143,4 @@ add_subdirectory(Tests/Functional)
 add_subdirectory(cmake)
 
 # make package targets
-include(BornAgainCPack)
+include(BornAgain/Pack)

cmake/modules/CheckCompiler.cmake → cmake/BornAgain/Compiler.cmake

@@ -14,16 +14,6 @@ message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 
 find_package(Threads)
 
-#--- Setup details depending on the major platform type ---
-
-if(CMAKE_SYSTEM_NAME MATCHES Linux)
-    include(SetUpLinux)
-elseif(APPLE)
-    include(SetUpMacOS)
-elseif(WIN32)
-    include(SetUpWindows)
-endif()
-
 #--- Print the final compiler flags ---
 
 message(STATUS "BornAgain Platform: ${BORNAGAIN_PLATFORM}")

cmake/modules/BornAgainCPack.cmake → cmake/BornAgain/Pack.cmake

@@ -19,11 +19,11 @@ endif()
 
 
 if(WIN32)
-    include(CPackWindows)
+    include(BornAgain/PackWindows)
 elseif(APPLE)
-    include(CPackApple)
+    include(BornAgain/PackMacOS)
 elseif(UNIX AND BUILD_DEBIAN) # one can build debian package only on UNIX system
-    include(CPackDebian)
+    include(BornAgain/PackDebian)
 else()
   set(CPACK_GENERATOR "TGZ")
 endif()