[mapguide-commits] r9294 - in sandbox/jng/cmake_v2: . Oem cmake/modules
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jan 8 23:43:27 PST 2018
Author: jng
Date: 2018-01-08 23:43:27 -0800 (Mon, 08 Jan 2018)
New Revision: 9294
Added:
sandbox/jng/cmake_v2/cmake/modules/FindAnt.cmake
Modified:
sandbox/jng/cmake_v2/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/CMakeLists.txt
Log:
Install fusion and its templates
Modified: sandbox/jng/cmake_v2/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-09 07:23:31 UTC (rev 9293)
+++ sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-09 07:43:27 UTC (rev 9294)
@@ -139,6 +139,7 @@
find_package(TCLAP REQUIRED)
find_package(LinuxApt REQUIRED)
find_package(DbXmlInternal REQUIRED)
+find_package(Ant REQUIRED)
# Set internal tool paths
set(IMAKE_TOOL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/WebTools/IMake/IMake)
Modified: sandbox/jng/cmake_v2/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CMakeLists.txt 2018-01-09 07:23:31 UTC (rev 9293)
+++ sandbox/jng/cmake_v2/Oem/CMakeLists.txt 2018-01-09 07:43:27 UTC (rev 9294)
@@ -1,3 +1,9 @@
+###### Fusion #####
+file(COPY "fusion" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "fusionMG" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+set(FUSION_WORK_DIR ${CMAKE_CURRENT_BINARY_DIR}/fusion)
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${FUSION_WORK_DIR} ant deploy -Ddeploy.home=${MG_WWWROOT}/fusion)")
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fusionMG/templates DESTINATION ${MG_WWWROOT}/fusion)
###### LinuxApt ######
make_install(${MG_OEM_WORK_DIR}/LinuxApt/php-${PHP_VER})
make_install(${MG_OEM_WORK_DIR}/LinuxApt/httpd-${HTTPD_VER})
Added: sandbox/jng/cmake_v2/cmake/modules/FindAnt.cmake
===================================================================
--- sandbox/jng/cmake_v2/cmake/modules/FindAnt.cmake (rev 0)
+++ sandbox/jng/cmake_v2/cmake/modules/FindAnt.cmake 2018-01-09 07:43:27 UTC (rev 9294)
@@ -0,0 +1,14 @@
+# - Find Ant
+# Find the Apache Ant binary
+# This module defines
+# ANT_PROGRAM, the ant executable
+
+find_program(ANT_PROGRAM NAMES ant)
+
+if (ANT_PROGRAM)
+ message(STATUS "Found ant: ${ANT_PROGRAM}")
+else (ANT_PROGRAM)
+ message(FATAL_ERROR "Ant not found")
+endif (ANT_PROGRAM)
+
+mark_as_advanced(ANT_PROGRAM)
More information about the mapguide-commits
mailing list