From bda35ed4d652a3c978e1565c31ed0c87cb3753af Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 12 Jun 2015 11:12:58 -0400 Subject: [PATCH] fix bootstrap.ini substitution --- web/CMakeLists.txt | 1 + web/api/CMakeLists.txt | 3 +++ web/api/app/Config/{bootstrap.php => bootstrap.php.in} | 0 3 files changed, 4 insertions(+) rename web/api/app/Config/{bootstrap.php => bootstrap.php.in} (100%) diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt index f7bb3ec0c..b9e75a7e8 100644 --- a/web/CMakeLists.txt +++ b/web/CMakeLists.txt @@ -17,6 +17,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/includes/config.php" DESTINATION "${Z if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) # Install the mootools symlinks (if its not in the source directory) diff --git a/web/api/CMakeLists.txt b/web/api/CMakeLists.txt index 56bc82a50..3d865527b 100644 --- a/web/api/CMakeLists.txt +++ b/web/api/CMakeLists.txt @@ -10,3 +10,6 @@ configure_file(app/Config/database.php.default "${CMAKE_CURRENT_BINARY_DIR}/app/ # Configure core.php configure_file(app/Config/core.php.default "${CMAKE_CURRENT_BINARY_DIR}/app/Config/core.php" @ONLY) + +# Configure bootstrap.php +configure_file(app/Config/bootstrap.php.in "${CMAKE_CURRENT_BINARY_DIR}/app/Config/bootstrap.php" @ONLY) diff --git a/web/api/app/Config/bootstrap.php b/web/api/app/Config/bootstrap.php.in similarity index 100% rename from web/api/app/Config/bootstrap.php rename to web/api/app/Config/bootstrap.php.in