[mapguide-commits] r9290 - in sandbox/jng/cmake_v2: . Common Common/MapGuideCommon Oem Oem/CsMapLibrary Server Server/src Server/src/Core Server/src/Gws Web Web/src Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jan 8 09:11:33 PST 2018
Author: jng
Date: 2018-01-08 09:11:33 -0800 (Mon, 08 Jan 2018)
New Revision: 9290
Modified:
sandbox/jng/cmake_v2/CMakeLists.txt
sandbox/jng/cmake_v2/Common/CMakeLists.txt
sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/CsMapLibrary/CMakeLists.txt
sandbox/jng/cmake_v2/Server/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Gws/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:
Light up content/target/file installation for most projects
Modified: sandbox/jng/cmake_v2/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -61,9 +61,17 @@
set(MG_SERVER_SERVICES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Services")
set(MG_SERVER_GWS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Gws")
+set(MG_COMPONENT_COMMON "common")
+set(MG_COMPONENT_SERVER "server")
+set(MG_COMPONENT_WEB "web")
+
# Override install directory to match what the automake build does (/usr/local, rather than /usr/local/lib)
set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-${MG_VERSION}")
set(MG_INSTALL_WEB_PREFIX "${MG_INSTALL_PREFIX}/webserverextensions")
+set(MG_WWWROOT "${MG_INSTALL_WEB_PREFIX}/www")
+set(MG_INSTALL_SERVER_PREFIX "${MG_INSTALL_PREFIX}/server")
+set(MG_SERVER_BIN_DIR "${MG_INSTALL_SERVER_PREFIX}/bin")
+set(MG_INSTALL_COORDSYS_PREFIX "${MG_INSTALL_PREFIX}/share/gis/coordsys")
set(CMAKE_INSTALL_PREFIX "${MG_INSTALL_PREFIX}")
set(MG_VERSION_SUFFIX "-${MG_VERSION}")
@@ -81,6 +89,16 @@
endif(UNIX)
endmacro(set_install_subdir)
+macro(make_install workdir)
+ if (UNIX)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${workdir} make install)")
+ endif (UNIX)
+endmacro(make_install workdir)
+
+macro(install_empty_directory dirname root)
+ install(CODE "file(MAKE_DIRECTORY ${root}/${dirname})")
+endmacro(install_empty_directory dirname root)
+
if(UNIX)
add_definitions(-DFULLPROTO -fPIC -DPIC)
endif(UNIX)
Modified: sandbox/jng/cmake_v2/Common/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Common/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -5,7 +5,7 @@
add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
-set(MG_COMPONENT "common")
+set(MG_COMPONENT ${MG_COMPONENT_COMMON})
set_install_subdir("")
add_subdirectory(Foundation)
@@ -17,3 +17,5 @@
add_subdirectory(Renderers)
add_subdirectory(Security)
add_subdirectory(Stylization)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Schema DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT_SERVER})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -28,5 +28,8 @@
MgSecurity${MG_VERSION_SUFFIX}
)
-install( TARGETS MgMapGuideCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT} )
\ No newline at end of file
+install(TARGETS MgMapGuideCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT})
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Oem/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -54,6 +54,7 @@
BUILD_IN_SOURCE 0
)
add_dependencies(httpd httpd-fake)
+make_install(${LinuxAptHttpd_WORKDIR})
# This sounds dirty, but we need to communicate back to projects that use httpd (in a different dir) where
# the httpd headers are
@@ -83,6 +84,7 @@
BUILD_IN_SOURCE 0
)
add_dependencies(php httpd-fake)
+make_install(${LinuxAptPhp_WORKDIR})
# This sounds dirty, but we need to communicate back to projects that use php (in a different dir) where
# the httpd headers are
Modified: sandbox/jng/cmake_v2/Oem/CsMapLibrary/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CsMapLibrary/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Oem/CsMapLibrary/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -139,4 +139,5 @@
../CsMap/Source/csIoUtil.cpp
)
-add_library(CsMap STATIC ${CsMap_SRCS})
\ No newline at end of file
+add_library(CsMap STATIC ${CsMap_SRCS})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../CsMap/Dictionaries DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Server/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -1,6 +1,13 @@
add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
-set(MG_COMPONENT "server")
+set(MG_COMPONENT ${MG_COMPONENT_SERVER})
set_install_subdir("server/")
-add_subdirectory(src)
\ No newline at end of file
+add_subdirectory(src)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/RepositoryAdmin DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
+install_empty_directory("Logs" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Packages" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Repositories" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Temp" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Trash" ${MG_INSTALL_SERVER_PREFIX})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Server/src/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -4,4 +4,7 @@
add_subdirectory(Services)
add_subdirectory(UnitTesting)
#add_subdirectory(Wfs)
-#add_subdirectory(Wms)
\ No newline at end of file
+#add_subdirectory(Wms)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Wfs DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Wms DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -75,4 +75,7 @@
MgStylization${MG_VERSION_SUFFIX}
MgRenderers${MG_VERSION_SUFFIX}
)
-add_dependencies(mgserver dbxml-build)
\ No newline at end of file
+add_dependencies(mgserver dbxml-build)
+install(TARGETS mgserver DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mapguidectl DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/serverconfig.ini DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Gws/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Gws/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Server/src/Gws/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -1,6 +1,8 @@
set(MG_COMPONENT "common")
set(CMAKE_INSTALL_PREFIX "${MG_INSTALL_PREFIX}")
+set_install_subdir("")
+
add_subdirectory(GwsCommon)
add_subdirectory(GwsQueryEngine)
add_subdirectory(GwsResource)
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Web/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Web/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -8,7 +8,7 @@
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
endif( CMAKE_COMPILER_IS_GNUCXX )
-set(MG_COMPONENT "web")
+set(MG_COMPONENT ${MG_COMPONENT_WEB})
set_install_subdir("webserverextensions/")
add_subdirectory(src)
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -30,11 +30,13 @@
../WebSupport/InitializeWebTier.cpp
)
-add_library(mod_mgmapagent SHARED ${mod_mgmapagent_SRCS})
-add_sanitizers(mod_mgmapagent)
-add_dependencies(mod_mgmapagent httpd)
+add_library(mod_mgmapagent${MG_VERSION_SUFFIX} SHARED ${mod_mgmapagent_SRCS})
+add_sanitizers(mod_mgmapagent${MG_VERSION_SUFFIX})
+add_dependencies(mod_mgmapagent${MG_VERSION_SUFFIX} httpd)
+install(TARGETS mod_mgmapagent${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/mod_mgmapagent${MG_VERSION_SUFFIX}.so mod_mgmapagent.so ${MG_COMPONENT})
-target_link_libraries(mod_mgmapagent
+target_link_libraries(mod_mgmapagent${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
MgPlatformBase${MG_VERSION_SUFFIX}
MgMdfModel${MG_VERSION_SUFFIX}
@@ -44,4 +46,4 @@
)
# Make sure this doesn't have the "lib" prefix
-set_target_properties(mod_mgmapagent PROPERTIES PREFIX "")
\ No newline at end of file
+set_target_properties(mod_mgmapagent${MG_VERSION_SUFFIX} PROPERTIES PREFIX "")
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Web/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/CMakeLists.txt 2018-01-08 09:24:32 UTC (rev 9289)
+++ sandbox/jng/cmake_v2/Web/src/CMakeLists.txt 2018-01-08 17:11:33 UTC (rev 9290)
@@ -11,4 +11,18 @@
# Needed for api binding generation
file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY "WEB-INF" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
+file(COPY "WEB-INF" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/localized DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapadmin DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapagent DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapviewerphp DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+if (WITH_JAVA)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapviewerjava DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/WEB-INF DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+endif (WITH_JAVA)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/schemareport DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stdicons DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/viewerfiles DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/webconfig.ini DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install_empty_directory("TempDir" ${MG_WWWROOT})
\ No newline at end of file
More information about the mapguide-commits
mailing list