destination_runtime_configs -> BUILD_AUTO_DIR

Core/CMakeLists.txt

@@ -213,8 +213,8 @@ if(WIN32)
 else()
     # Install thisbornagain.sh.
     install(FILES
-                ${destination_runtime_configs}/thisbornagain.sh
-                ${destination_runtime_configs}/thisbornagain.csh
+                ${BUILD_AUTO_DIR}/thisbornagain.sh
+                ${BUILD_AUTO_DIR}/thisbornagain.csh
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
         GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         DESTINATION ${destination_libexec})

GUI/main/CMakeLists.txt

@@ -71,10 +71,10 @@ endif()
 if(APPLE)
     set(MACOSX_BUNDLE_IDENTIFIER "org.bornagainproject.BornAgain")
     configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/MacOSXBundleInfo.plist.in"
-        "${destination_runtime_configs}/Info.plist" @ONLY)
+        "${BUILD_AUTO_DIR}/Info.plist" @ONLY)
 
     set_target_properties(${executable_name}
-        PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${destination_runtime_configs}/Info.plist)
+        PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${BUILD_AUTO_DIR}/Info.plist)
 
     set(link_flags "-Wl,-rpath,@loader_path/../Frameworks/ -Wl,-rpath,@loader_path/../lib/BornAgain-${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR}/")
     set_target_properties(${executable_name} PROPERTIES LINK_FLAGS ${link_flags})
@@ -111,8 +111,8 @@ if(UNIX)
             DESTINATION ${destination_bundle}/Contents/Resources/
         )
         configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/FixAppleBundle.cmake.in
-                       ${destination_runtime_configs}/FixAppleBundle.cmake @ONLY)
-        install(SCRIPT ${destination_runtime_configs}/FixAppleBundle.cmake COMPONENT Runtime)
+                       ${BUILD_AUTO_DIR}/FixAppleBundle.cmake @ONLY)
+        install(SCRIPT ${BUILD_AUTO_DIR}/FixAppleBundle.cmake COMPONENT Runtime)
 
     elseif(NOT BUILD_DEBIAN)
         # creating link to BornAgain gui in bin directory

Tests/FunctionalTests/CMakeLists.txt

@@ -15,9 +15,6 @@ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_directory
     ${CMAKE_SOURCE_DIR}/Tests/FunctionalTests/TestPyFit
     ${CMAKE_BINARY_DIR}/Tests/FunctionalTests/TestPyFit )
 
-#file(COPY ${CMAKE_SOURCE_DIR}/Tests/FunctionalTests/TestPyFit DESTINATION ${CMAKE_BINARY_DIR}/Tests/FunctionalTests/TestPyFit)
-#COPY_IF_DIFFERENT( ${CMAKE_SOURCE_DIR}/Tests/FunctionalTests/TestPyFit ${CMAKE_BINARY_DIR}/Tests/FunctionalTests/TestPyFit ${SRC_FILES} IncludeTargets "Includes")
-
 add_subdirectory(TestCore)
 add_subdirectory(TestFit)
 

cmake/modules/BornAgainConfiguration.cmake

@@ -35,12 +35,12 @@ endif()
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(destination_runtime_configs ${CMAKE_BINARY_DIR}/runtime_configs)
+set(BUILD_AUTO_DIR ${CMAKE_BINARY_DIR}/auto)
 
 file(MAKE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 file(MAKE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/bornagain)
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(MAKE_DIRECTORY ${destination_runtime_configs})
+file(MAKE_DIRECTORY ${BUILD_AUTO_DIR})
 
 # -----------------------------------------------------------------------------
 # file extensions
@@ -110,16 +110,16 @@ endif()
 
 set(this_bindir $BORNAGAINSYS/bin)
 set(this_libdir $BORNAGAINSYS/lib/${destination_suffix})
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/thisbornagain.sh.in" "${destination_runtime_configs}/thisbornagain.sh" @ONLY)
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/thisbornagain.csh.in" "${destination_runtime_configs}/thisbornagain.csh" @ONLY)
+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 C++ source code
 # -----------------------------------------------------------------------------
 
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/BAConfigure.h.in" "${destination_runtime_configs}/BAConfigure.h" @ONLY)
-configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/BAPython.h.in" "${destination_runtime_configs}/BAPython.h" @ONLY)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${destination_runtime_configs}")
+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)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BUILD_AUTO_DIR}")
 
 # -----------------------------------------------------------------------------
 # configure postinst and prerm for the debian package
@@ -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" "${destination_runtime_configs}/postinst" @ONLY)
-    configure_file("${CMAKE_SOURCE_DIR}/cmake/scripts/prerm.in" "${destination_runtime_configs}/prerm" @ONLY)
+    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)
     set(CMAKE_INSTALL_RPATH "\$ORIGIN/../../lib/${destination_suffix}")
 endif(BUILD_DEBIAN)

cmake/modules/CPackDebian.cmake

@@ -31,7 +31,7 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_PACKAGE_VERSIO
 set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${CPACK_DEBIAN_PACKAGE_NAME}(<=${BORNAGAIN_VERSION})")
 
 # set postinstall and preremove scripts for the debian package
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${destination_runtime_configs}/postinst;${destination_runtime_configs}/prerm;")
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${BUILD_AUTO_DIR}/postinst;${BUILD_AUTO_DIR}/prerm;")
 
 # write copyrite file
 file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/copyright" INPUT "${CMAKE_SOURCE_DIR}/COPYING")

cmake/modules/UnitTests.cmake

@@ -31,7 +31,7 @@ function(UNIT_TESTS TEST_NAME SUBDIR LINK_LIB)
     file(READ "${CMAKE_MODULE_PATH}/unitTests.cpp.footer" TMPTMP)
     set(TMP "${TMP}\n${TMPTMP}")
 
-    set(TEST_SRC "${CMAKE_BINARY_DIR}/${TEST_NAME}.cpp")
+    set(TEST_SRC "${BUILD_AUTO_DIR}/${TEST_NAME}.cpp")
     file(WRITE ${TEST_SRC} "${TMP}")
 
     set(EXE ${TEST_NAME})