[mapguide-commits] r9277 - in sandbox/jng/cmake_v2: Oem Web Web/src Web/src/ApacheAgent

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-05 03:32:53 -0800 (Fri, 05 Jan 2018)
New Revision: 9277

Modified:
   sandbox/jng/cmake_v2/Oem/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/CMakeLists.txt
Log:
Get mod_mgmapagent building

Modified: sandbox/jng/cmake_v2/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
+++ sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2018-01-05 11:32:53 UTC (rev 9277)
@@ -19,6 +19,10 @@
     BUILD_IN_SOURCE 0
 )
 
+#This sounds dirty, but we need to communicate back to ApacheAgent (in a different dir) where 
+#the httpd headers are
+set(MG_OEM_HTTPD_SOURCE_DIR "${LinuxAptHttpd_WORKDIR}/httpd-${HTTPD_VER}" PARENT_SCOPE)
+
 #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

Modified: sandbox/jng/cmake_v2/Web/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
+++ sandbox/jng/cmake_v2/Web/CMakeLists.txt	2018-01-05 11:32:53 UTC (rev 9277)
@@ -2,6 +2,9 @@
 
 # NOTE: Not applied for server tier projects except for mgserver main executable
 if( CMAKE_COMPILER_IS_GNUCXX )
+    # Stash a copy of current shared linker flags in case any project needs to build
+    # with undefined symbols
+    set ( WEB_CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
     set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
 endif( CMAKE_COMPILER_IS_GNUCXX )
 

Modified: sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
+++ sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt	2018-01-05 11:32:53 UTC (rev 9277)
@@ -1,3 +1,8 @@
+if (CMAKE_COMPILER_IS_GNUCXX)
+    message ("Restoring default linker flags for mod_mgmapagent")
+    set ( CMAKE_SHARED_LINKER_FLAGS "${WEB_CMAKE_SHARED_LINKER_FLAGS}")
+endif (CMAKE_COMPILER_IS_GNUCXX)
+
 include_directories(
     ${MG_COMMON_DIR}/Foundation
     ${MG_COMMON_DIR}/Geometry
@@ -26,6 +31,8 @@
 )
 
 add_library(mod_mgmapagent SHARED ${mod_mgmapagent_SRCS})
+set_target_properties(mod_mgmapagent PROPERTIES PREFIX "")
+add_dependencies(mod_mgmapagent httpd)
 
 target_link_libraries(mod_mgmapagent
     MgFoundation${MG_VERSION_SUFFIX}

Modified: sandbox/jng/cmake_v2/Web/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/CMakeLists.txt	2018-01-05 10:42:41 UTC (rev 9276)
+++ sandbox/jng/cmake_v2/Web/src/CMakeLists.txt	2018-01-05 11:32:53 UTC (rev 9277)
@@ -1,3 +1,4 @@
+add_subdirectory(ApacheAgent)
 add_subdirectory(WebApp)
 add_subdirectory(WebSupport)
 add_subdirectory(HttpHandler)
@@ -7,7 +8,6 @@
     add_subdirectory(JavaApi)
     add_subdirectory(JavaApiEx)
 endif (WITH_JAVA)
-#add_subdirectory(ApacheAgent)
 
 # Needed for api binding generation
 file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})