[mapguide-commits] r9310 - sandbox/jng/cmake_v2/Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-10 08:38:38 -0800 (Wed, 10 Jan 2018)
New Revision: 9310

Modified:
   sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt
Log:
Fix serverconfig.ini install in light of improving the test/debug/run-ability of the built mgserver

Modified: sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt	2018-01-10 15:25:43 UTC (rev 9309)
+++ sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt	2018-01-10 16:38:38 UTC (rev 9310)
@@ -103,8 +103,8 @@
     execute_process(COMMAND sed -i "s#/usr/local/mapguideopensource/server#${MG_INSTALL_SERVER_PREFIX}#g" ${CMAKE_CURRENT_BINARY_DIR}/mapguidectl)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mapguidectl DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
 endif (UNIX)
-configure_file(${CMAKE_MODULE_PATH}/../configs/serverconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/serverconfig_linux.ini)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/serverconfig_linux.ini DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+configure_file(${CMAKE_MODULE_PATH}/../configs/serverconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/staging/serverconfig.ini)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging/serverconfig.ini DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
 configure_file(${CMAKE_MODULE_PATH}/../configs/mgserver.sh.in ${CMAKE_CURRENT_BINARY_DIR}/mgserver.sh)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mgserver.sh DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
 configure_file(${CMAKE_MODULE_PATH}/../configs/mgserverd.sh.in ${CMAKE_CURRENT_BINARY_DIR}/mgserverd.sh)