[mapguide-commits] r9276 - in sandbox/jng/cmake_v2: . Oem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-05 02:42:41 -0800 (Fri, 05 Jan 2018)
New Revision: 9276

Modified:
   sandbox/jng/cmake_v2/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/CMakeLists.txt
Log:
CMake configuration to build httpd in Oem/LinuxApt but to do it out-of-source-tree

Modified: sandbox/jng/cmake_v2/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/CMakeLists.txt	2018-01-05 10:32:23 UTC (rev 9275)
+++ sandbox/jng/cmake_v2/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
@@ -65,7 +65,6 @@
     if(UNIX)
         set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
         if(MG_CPU EQUAL 64)
-            message(STATUS "Compiling in 64 bits machine")
             set(LIB_SUFFIX "64")
         endif(MG_CPU EQUAL 64)
         set(LIB_INSTALL_DIR "${relbase}lib${LIB_SUFFIX}")

Modified: sandbox/jng/cmake_v2/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2018-01-05 10:32:23 UTC (rev 9275)
+++ sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
@@ -1,7 +1,27 @@
+
+set(LinuxApt_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/LinuxApt")
+set(HTTPD_VER 2.4.18)
+set(TOMCAT_VER 7.0.68)
+set(CONNECTOR_VER 1.2.41)
+set(LinuxAptHttpd_WORKDIR "${CMAKE_CURRENT_BINARY_DIR}/LinuxApt_Build/httpd")
+ExternalProject_Add(httpd
+    STAMP_DIR ${LinuxAptHttpd_WORKDIR}
+    DOWNLOAD_DIR ${LinuxAptHttpd_WORKDIR}
+    DOWNLOAD_COMMAND 
+        COMMAND tar -jxf ${LinuxApt_SOURCE}/httpd-${HTTPD_VER}.tar.bz2
+        COMMAND tar -jxf ${LinuxApt_SOURCE}/httpd-${HTTPD_VER}-deps.tar.bz2
+    PREFIX ${LinuxAptHttpd_WORKDIR}
+    SOURCE_DIR ${LinuxAptHttpd_WORKDIR}
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E chdir ${LinuxAptHttpd_WORKDIR}/httpd-${HTTPD_VER} ./configure --prefix=${CMAKE_INSTALL_PREFIX}/webserverextensions/apache2 --enable-mods-shared-all --with-included-apr --with-port=${MG_HTTPD_PORT}
+    BUILD_COMMAND ${CMAKE_COMMAND} -E chdir ${LinuxAptHttpd_WORKDIR}/httpd-${HTTPD_VER} make
+    INSTALL_COMMAND ""
+    #INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir ${LinuxAptHttpd_WORKDIR}/httpd-${HTTPD_VER} make install
+    BUILD_IN_SOURCE 0
+)
+
 #TODO: We have geos in-tree, which is CMake-enabled, so if required we can use
 #the internal copy of geos if required through an option like INTERNAL_GEOS
 #at the moment, we are just using the system-provided version of GEOS
-
 #set(GEOS_ENABLE_TESTS OFF)
 #add_subdirectory(geos)
 add_subdirectory(DWFTK)