cmake: shorter directory names, clearer hierarchy

CMakeLists.txt

@@ -27,7 +27,9 @@ option(BORNAGAIN_TIFF_SUPPORT "Tiff files read/write support" ON)
 
 #--- Include CMake macros and functions ---
 set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake/generic-modules ${CMAKE_SOURCE_DIR}/cmake/bornagain-modules)
+    ${CMAKE_SOURCE_DIR}/cmake/generic/modules ${CMAKE_SOURCE_DIR}/cmake/bornagain/modules)
+set(TEMPLATE_DIR ${CMAKE_SOURCE_DIR}/cmake/bornagain/scripts)
+
 include(GetFilenameComponent) # overwrite CMake command
 include(BornAgainMacros)
 include(SearchInstalledSoftware)
@@ -54,7 +56,7 @@ if(BORNAGAIN_GUI)
 endif()
 add_subdirectory(Tests/FunctionalTests)  # functional tests (make check)
 
-add_subdirectory(cmake) # trick to print an after-install message
+add_subdirectory(cmake/bornagain) # trick to print an after-install message
 
 # packaging
 include(BornAgainCPack)

cmake/bornagain-modules/BornAgainConfiguration.cmake → cmake/bornagain/modules/BornAgainConfiguration.cmake

@@ -95,13 +95,13 @@ message(STATUS "Destination directories: bin->${destination_bin}, lib->${destina
 
 if(BORNAGAIN_RELEASE)
     # configure a header file to pass CMake settings to the source code
-    configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/BAVersion.h.in" "${CMAKE_SOURCE_DIR}/Core/Samples/inc/BAVersion.h")
+    configure_file("${TEMPLATE_DIR}/BAVersion.h.in" "${CMAKE_SOURCE_DIR}/Core/Samples/inc/BAVersion.h")
 
     # configure Doxyfile
     configure_file("${CMAKE_SOURCE_DIR}/Doc/Doxygen/Doxyfile.in" "${CMAKE_SOURCE_DIR}/Doc/Doxygen/Doxyfile" @ONLY)
 
     # configure FindBornagain script
-    configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/FindBornAgain.cmake.in" "${CMAKE_SOURCE_DIR}/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake" @ONLY)
+    configure_file("${TEMPLATE_DIR}/FindBornAgain.cmake.in" "${CMAKE_SOURCE_DIR}/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake" @ONLY)
 endif()
 
 # -----------------------------------------------------------------------------
@@ -110,15 +110,15 @@ endif()
 
 set(this_bindir $BORNAGAINSYS/bin)
 set(this_libdir $BORNAGAINSYS/lib/${destination_suffix})
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/thisbornagain.sh.in" "${BUILD_AUTO_DIR}/thisbornagain.sh" @ONLY)
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/thisbornagain.csh.in" "${BUILD_AUTO_DIR}/thisbornagain.csh" @ONLY)
+configure_file("${TEMPLATE_DIR}/thisbornagain.sh.in" "${BUILD_AUTO_DIR}/thisbornagain.sh" @ONLY)
+configure_file("${TEMPLATE_DIR}/thisbornagain.csh.in" "${BUILD_AUTO_DIR}/thisbornagain.csh" @ONLY)
 
 # -----------------------------------------------------------------------------
 # configure C++ source code
 # -----------------------------------------------------------------------------
 
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/BAConfigure.h.in" "${BUILD_AUTO_DIR}/BAConfigure.h" @ONLY)
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/BAPython.h.in" "${BUILD_AUTO_DIR}/BAPython.h" @ONLY)
+configure_file("${TEMPLATE_DIR}/BAConfigure.h.in" "${BUILD_AUTO_DIR}/BAConfigure.h" @ONLY)
+configure_file("${TEMPLATE_DIR}/BAPython.h.in" "${BUILD_AUTO_DIR}/BAPython.h" @ONLY)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BUILD_AUTO_DIR}")
 
 # -----------------------------------------------------------------------------
@@ -131,7 +131,7 @@ if(BUILD_DEBIAN)
         OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
         OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-    configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/postinst.in" "${BUILD_AUTO_DIR}/postinst" @ONLY)
-    configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/prerm.in" "${BUILD_AUTO_DIR}/prerm" @ONLY)
+    configure_file("${TEMPLATE_DIR}/postinst.in" "${BUILD_AUTO_DIR}/postinst" @ONLY)
+    configure_file("${TEMPLATE_DIR}/prerm.in" "${BUILD_AUTO_DIR}/prerm" @ONLY)
     set(CMAKE_INSTALL_RPATH "\$ORIGIN/../../lib/${destination_suffix}")
 endif(BUILD_DEBIAN)

cmake/bornagain-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_SOURCE_DIR}/cmake/scripts/unitTests.cpp.header" TMPTMP)
+    file(READ "${TEMPLATE_DIR}/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_SOURCE_DIR}/cmake/scripts/unitTests.cpp.footer" TMPTMP)
+    file(READ "${TEMPLATE_DIR}/unitTests.cpp.footer" TMPTMP)
     set(TMP "${TMP}\n${TMPTMP}")
 
     set(TEST_SRC "${BUILD_AUTO_DIR}/${TEST_NAME}.cpp")