[mapguide-commits] r9724 - in trunk/MgDev: . Common Common/MapGuideCommon Oem Web Web/src Web/src/HttpHandler Web/src/WebApp Web/src/WebSupport cmake/modules
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Aug 26 08:48:59 PDT 2020
Author: jng
Date: 2020-08-26 08:48:58 -0700 (Wed, 26 Aug 2020)
New Revision: 9724
Modified:
trunk/MgDev/CMakeLists.txt
trunk/MgDev/Common/CMakeLists.txt
trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
trunk/MgDev/Oem/CMakeLists.txt
trunk/MgDev/Web/CMakeLists.txt
trunk/MgDev/Web/src/CMakeLists.txt
trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
trunk/MgDev/Web/src/WebApp/CMakeLists.txt
trunk/MgDev/Web/src/WebSupport/CMakeLists.txt
trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake
trunk/MgDev/cmake_bootstrap.sh
trunk/MgDev/cmake_build.sh
Log:
CMake: Add build support for only building the common libs subset. Fixes #2794
Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -104,9 +104,15 @@
set(MG_COMPONENT_SERVER "server")
set(MG_COMPONENT_WEB "web")
+set(MG_COMMON_SUBSET_ONLY "${COMMON_SUBSET_ONLY}")
+
# Override install directory to match what the automake build does (/usr/local, rather than /usr/local/lib)
if (NOT MG_INSTALL_PREFIX)
- set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-${MG_VERSION}")
+ if (COMMON_SUBSET_ONLY)
+ set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-common-${MG_VERSION}")
+ else (COMMON_SUBSET_ONLY)
+ set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-${MG_VERSION}")
+ endif (COMMON_SUBSET_ONLY)
endif (NOT MG_INSTALL_PREFIX)
# Have our sub-prefixes be relative for ease of packaging
set(MG_INSTALL_WEB_PREFIX "webserverextensions")
@@ -247,14 +253,25 @@
set (NEED_LIBRT 1)
endif (NOT HAVE_CLOCK_GETTIME)
-add_subdirectory(BuildTools)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(BuildTools)
+endif (NOT MG_COMMON_SUBSET_ONLY)
add_subdirectory(Oem)
add_subdirectory(Common)
-add_subdirectory(Server)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(Server)
+endif (NOT MG_COMMON_SUBSET_ONLY)
add_subdirectory(Web)
-add_subdirectory(UnitTest)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(UnitTest)
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
if (WITH_DESKTOP)
add_subdirectory(Desktop)
else (WITH_DESKTOP)
message(STATUS "Skipping optional mg-desktop support")
-endif (WITH_DESKTOP)
\ No newline at end of file
+endif (WITH_DESKTOP)
+
+if (MG_COMMON_SUBSET_ONLY)
+ message(STATUS "Only building common libs subset")
+endif (MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Common/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Common/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -21,11 +21,15 @@
add_subdirectory(MdfModel)
add_subdirectory(MdfParser)
add_subdirectory(PlatformBase)
-add_subdirectory(Renderers)
add_subdirectory(Security)
-add_subdirectory(Stylization)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(Renderers)
+ add_subdirectory(Stylization)
+endif (NOT MG_COMMON_SUBSET_ONLY)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Schema DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT_SERVER})
+if (NOT MG_COMMON_SUBSET_ONLY)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Schema DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT_SERVER})
+endif (NOT MG_COMMON_SUBSET_ONLY)
if (INTERNAL_XERCES)
file(GLOB XERCES_LIBS "${MG_OEM_WORK_DIR}/dbxml/install/lib/libxerces-c*.so")
@@ -32,7 +36,9 @@
install(FILES ${XERCES_LIBS} DESTINATION ${LIB_INSTALL_DIR})
endif (INTERNAL_XERCES)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwfcore/libdwfcore-1.7.0.so DESTINATION ${LIB_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwf/libdwftk-7.7.0.so DESTINATION ${LIB_INSTALL_DIR})
+if (NOT MG_COMMON_SUBSET_ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwfcore/libdwfcore-1.7.0.so DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwf/libdwftk-7.7.0.so DESTINATION ${LIB_INSTALL_DIR})
+endif (NOT MG_COMMON_SUBSET_ONLY)
configure_file(${CMAKE_MODULE_PATH}/../configs/ProductVersion.h.in ${MG_AUTO_GENERATED_HEADER_DIR}/ProductVersion.h)
\ No newline at end of file
Modified: trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -32,5 +32,7 @@
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_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
+if (NOT MG_COMMON_SUBSET_ONLY)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Oem/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Oem/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -1,19 +1,22 @@
-###### Fusion #####
-# TODO: Actual fusion build should be offloaded to bootstrapping with the "install"
-# step just copying the build output to its final destination because right now an
-# elevated install will "taint" the CMake build dir with root-owned files produced
-# from the below build task
-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)")
-if (UNIX)
- # Make the tcpdf cache dir
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${MG_WWWROOT}/fusion/lib/tcpdf/cache)")
- # httpd's default config is to use user/group daemon/daemon, so make it own the tcpdf cache directory in order for QuickPlot to work
- install(CODE "execute_process(COMMAND chown daemon:daemon ${MG_WWWROOT}/fusion/lib/tcpdf/cache)")
-endif (UNIX)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fusionMG/templates DESTINATION ${MG_WWWROOT}/fusion)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ ###### Fusion #####
+ # TODO: Actual fusion build should be offloaded to bootstrapping with the "install"
+ # step just copying the build output to its final destination because right now an
+ # elevated install will "taint" the CMake build dir with root-owned files produced
+ # from the below build task
+ 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)")
+ if (UNIX)
+ # Make the tcpdf cache dir
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${MG_WWWROOT}/fusion/lib/tcpdf/cache)")
+ # httpd's default config is to use user/group daemon/daemon, so make it own the tcpdf cache directory in order for QuickPlot to work
+ install(CODE "execute_process(COMMAND chown daemon:daemon ${MG_WWWROOT}/fusion/lib/tcpdf/cache)")
+ endif (UNIX)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fusionMG/templates DESTINATION ${MG_WWWROOT}/fusion)
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
###### Everything else ######
# TODO: We have geos in-tree, which is CMake-enabled, so if required we can use
@@ -21,8 +24,14 @@
# at the moment, we are just using the system-provided version of GEOS
#set(GEOS_ENABLE_TESTS OFF)
#add_subdirectory(geos)
-add_subdirectory(DWFTK)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(DWFTK)
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
add_subdirectory(CsMapLibrary)
-add_subdirectory(zlib_minizip)
-add_subdirectory(SWIGEx)
-add_subdirectory(LinuxApt)
\ No newline at end of file
+
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(zlib_minizip)
+ add_subdirectory(SWIGEx)
+ add_subdirectory(LinuxApt)
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Web/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Web/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -12,6 +12,11 @@
endif( CMAKE_COMPILER_IS_GNUCXX )
set(MG_COMPONENT ${MG_COMPONENT_WEB})
-set_install_subdir("webserverextensions/")
+if (NOT MG_COMMON_SUBSET_ONLY)
+ set_install_subdir("webserverextensions/")
+else (NOT MG_COMMON_SUBSET_ONLY) # For the common subset we want all the libs to be collected into a single place
+ set_install_subdir("")
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
add_subdirectory(src)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Web/src/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -1,37 +1,44 @@
-add_subdirectory(ApacheAgent)
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(ApacheAgent)
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
add_subdirectory(WebApp)
add_subdirectory(WebSupport)
add_subdirectory(HttpHandler)
-add_subdirectory(DevHttpServer)
-#add_subdirectory(CgiAgent)
-add_subdirectory(PhpApi)
-if (WITH_JAVA)
- add_subdirectory(JavaApi)
- add_subdirectory(JavaApiEx)
-endif (WITH_JAVA)
-# Needed for api binding generation
-file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY "WEB-INF" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+if (NOT MG_COMMON_SUBSET_ONLY)
+ add_subdirectory(DevHttpServer)
+ #add_subdirectory(CgiAgent)
+ add_subdirectory(PhpApi)
+ if (WITH_JAVA)
+ add_subdirectory(JavaApi)
+ add_subdirectory(JavaApiEx)
+ endif (WITH_JAVA)
-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})
+ # Needed for api binding generation
+ file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY "WEB-INF" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-# Stamp actual version to resizableadmin.php
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/mapadmin/resizableadmin.php DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/mapadmin)
-execute_process(COMMAND sed -i "s#${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.0.0#${MG_VERSION_FULL}#g" ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php DESTINATION ${MG_WWWROOT}/mapadmin COMPONENT ${MG_COMPONENT})
+ 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})
-configure_file(${CMAKE_MODULE_PATH}/../configs/webconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
-install_empty_directory("TempDir" ${MG_WWWROOT})
\ No newline at end of file
+ # Stamp actual version to resizableadmin.php
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/mapadmin/resizableadmin.php DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/mapadmin)
+ execute_process(COMMAND sed -i "s#${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.0.0#${MG_VERSION_FULL}#g" ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php DESTINATION ${MG_WWWROOT}/mapadmin 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})
+ configure_file(${CMAKE_MODULE_PATH}/../configs/webconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+ install_empty_directory("TempDir" ${MG_WWWROOT})
+
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -33,8 +33,17 @@
endif (INTERNAL_JSON)
# Set RPATH to avoid needing to use LD_LIBRARY_PATH in various configs
-if(MG_CPU EQUAL 64)
- set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
-else(MG_CPU EQUAL 64)
- set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
-endif(MG_CPU EQUAL 64)
\ No newline at end of file
+if (NOT MG_COMMON_SUBSET_ONLY)
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
+ endif(MG_CPU EQUAL 64)
+else (NOT MG_COMMON_SUBSET_ONLY)
+ # For the common subset, everything will be in a single place, so just use $ORIGIN
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgHttpHandler${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ endif(MG_CPU EQUAL 64)
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/WebApp/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/WebApp/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Web/src/WebApp/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -51,8 +51,17 @@
)
# Set RPATH to avoid needing to use LD_LIBRARY_PATH in various configs
-if(MG_CPU EQUAL 64)
- set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
-else(MG_CPU EQUAL 64)
- set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
-endif(MG_CPU EQUAL 64)
\ No newline at end of file
+if (NOT MG_COMMON_SUBSET_ONLY)
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
+ endif(MG_CPU EQUAL 64)
+else (NOT MG_COMMON_SUBSET_ONLY)
+ # For the common subset, everything will be in a single place, so just use $ORIGIN
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgWebApp${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ endif(MG_CPU EQUAL 64)
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/WebSupport/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/WebSupport/CMakeLists.txt 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/Web/src/WebSupport/CMakeLists.txt 2020-08-26 15:48:58 UTC (rev 9724)
@@ -21,8 +21,17 @@
)
# Set RPATH to avoid needing to use LD_LIBRARY_PATH in various configs
-if(MG_CPU EQUAL 64)
- set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
-else(MG_CPU EQUAL 64)
- set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
-endif(MG_CPU EQUAL 64)
\ No newline at end of file
+if (NOT MG_COMMON_SUBSET_ONLY)
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib64")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/../../lib")
+ endif(MG_CPU EQUAL 64)
+else (NOT MG_COMMON_SUBSET_ONLY)
+ # For the common subset, everything will be in a single place, so just use $ORIGIN
+ if(MG_CPU EQUAL 64)
+ set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ else(MG_CPU EQUAL 64)
+ set_target_properties(MgWebSupport${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ endif(MG_CPU EQUAL 64)
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake
===================================================================
--- trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake 2020-08-26 15:48:58 UTC (rev 9724)
@@ -77,82 +77,86 @@
find_package(XercesC REQUIRED)
endif (INTERNAL_XERCES)
-if (INTERNAL_GD)
- message(STATUS "Using internal GD")
- #find_package(GD REQUIRED
- # PATHS ${MG_OEM_WORK_DIR}/gd/gd
- # ${MG_OEM_WORK_DIR}/gd/gd/.libs)
- find_path(GD_INCLUDE_DIR
- NAMES "gd.h"
- PATHS ${MG_OEM_WORK_DIR}/gd/gd)
- find_library(GD_LIBRARY
- NAMES gd
- PATHS ${MG_OEM_WORK_DIR}/gd/gd/.libs)
- message(STATUS "GD Include Dir: ${GD_INCLUDE_DIR}")
- message(STATUS "GD Library: ${GD_LIBRARY}")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GD DEFAULT_MSG GD_LIBRARY GD_INCLUDE_DIR)
- mark_as_advanced(GD_INCLUDE_DIR GD_LIBRARY)
-else (INTERNAL_GD)
- find_package(GD REQUIRED)
-endif (INTERNAL_GD)
+if (NOT MG_COMMON_SUBSET_ONLY)
-if (INTERNAL_FREETYPE)
- message(STATUS "Using internal FreeType")
- #find_package(Freetype REQUIRED
- # PATHS ${MG_OEM_WORK_DIR}/gd/freetype
- # ${MG_OEM_WORK_DIR}/gd/freetype/.libs)
- find_path(FREETYPE_INCLUDE_DIRS
- NAMES "ft2build.h"
- PATHS ${MG_OEM_WORK_DIR}/gd/freetype/include)
- find_library(FREETYPE_LIBRARY
- NAMES freetype
- PATHS ${MG_OEM_WORK_DIR}/gd/freetype/objs/.libs)
- message(STATUS "FreeType Include Dir: ${FREETYPE_INCLUDE_DIRS}")
- message(STATUS "FreeType Library: ${FREETYPE_LIBRARY}")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(FreeType DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
- mark_as_advanced(FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARY)
-else (INTERNAL_FREETYPE)
- find_package(Freetype REQUIRED)
-endif (INTERNAL_FREETYPE)
+ if (INTERNAL_GD)
+ message(STATUS "Using internal GD")
+ #find_package(GD REQUIRED
+ # PATHS ${MG_OEM_WORK_DIR}/gd/gd
+ # ${MG_OEM_WORK_DIR}/gd/gd/.libs)
+ find_path(GD_INCLUDE_DIR
+ NAMES "gd.h"
+ PATHS ${MG_OEM_WORK_DIR}/gd/gd)
+ find_library(GD_LIBRARY
+ NAMES gd
+ PATHS ${MG_OEM_WORK_DIR}/gd/gd/.libs)
+ message(STATUS "GD Include Dir: ${GD_INCLUDE_DIR}")
+ message(STATUS "GD Library: ${GD_LIBRARY}")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GD DEFAULT_MSG GD_LIBRARY GD_INCLUDE_DIR)
+ mark_as_advanced(GD_INCLUDE_DIR GD_LIBRARY)
+ else (INTERNAL_GD)
+ find_package(GD REQUIRED)
+ endif (INTERNAL_GD)
-if (INTERNAL_JPEG)
- message(STATUS "Using internal libjpeg")
- #find_package(JPEG REQUIRED
- # PATHS ${MG_OEM_WORK_DIR}/gd/jpeg
- # ${MG_OEM_WORK_DIR}/gd/jpeg/.libs)
- find_path(JPEG_INCLUDE_DIR
- NAMES "jpeglib.h"
- PATHS ${MG_OEM_WORK_DIR}/gd/jpeg)
- find_library(JPEG_LIBRARY
- NAMES jpeg
- PATHS ${MG_OEM_WORK_DIR}/gd/jpeg/.libs)
- message(STATUS "libjpeg Include Dir: ${JPEG_INCLUDE_DIR}")
- message(STATUS "libjpeg Library: ${JPEG_LIBRARY}")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(jpeg DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR)
- mark_as_advanced(JPEG_INCLUDE_DIR JPEG_LIBRARY)
-else (INTERNAL_JPEG)
- find_package(JPEG REQUIRED)
-endif (INTERNAL_JPEG)
+ if (INTERNAL_FREETYPE)
+ message(STATUS "Using internal FreeType")
+ #find_package(Freetype REQUIRED
+ # PATHS ${MG_OEM_WORK_DIR}/gd/freetype
+ # ${MG_OEM_WORK_DIR}/gd/freetype/.libs)
+ find_path(FREETYPE_INCLUDE_DIRS
+ NAMES "ft2build.h"
+ PATHS ${MG_OEM_WORK_DIR}/gd/freetype/include)
+ find_library(FREETYPE_LIBRARY
+ NAMES freetype
+ PATHS ${MG_OEM_WORK_DIR}/gd/freetype/objs/.libs)
+ message(STATUS "FreeType Include Dir: ${FREETYPE_INCLUDE_DIRS}")
+ message(STATUS "FreeType Library: ${FREETYPE_LIBRARY}")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FreeType DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
+ mark_as_advanced(FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARY)
+ else (INTERNAL_FREETYPE)
+ find_package(Freetype REQUIRED)
+ endif (INTERNAL_FREETYPE)
-if (INTERNAL_PNG)
- message(STATUS "Using internal libpng")
- #find_package(PNG REQUIRED
- # PATHS ${MG_OEM_WORK_DIR}/gd/png
- # ${MG_OEM_WORK_DIR}/gd/png/.libs)
- find_path(PNG_INCLUDE_DIRS
- NAMES "png.h"
- PATHS ${MG_OEM_WORK_DIR}/gd/lpng)
- find_library(PNG_LIBRARY
- NAMES png
- PATHS ${MG_OEM_WORK_DIR}/gd/lpng/.libs)
- message(STATUS "libpng Include Dir: ${PNG_INCLUDE_DIRS}")
- message(STATUS "libpng Library: ${PNG_LIBRARY}")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(libpng DEFAULT_MSG PNG_LIBRARY PNG_INCLUDE_DIRS)
- mark_as_advanced(PNG_INCLUDE_DIRS PNG_LIBRARY)
-else (INTERNAL_PNG)
- find_package(PNG REQUIRED)
-endif (INTERNAL_PNG)
+ if (INTERNAL_JPEG)
+ message(STATUS "Using internal libjpeg")
+ #find_package(JPEG REQUIRED
+ # PATHS ${MG_OEM_WORK_DIR}/gd/jpeg
+ # ${MG_OEM_WORK_DIR}/gd/jpeg/.libs)
+ find_path(JPEG_INCLUDE_DIR
+ NAMES "jpeglib.h"
+ PATHS ${MG_OEM_WORK_DIR}/gd/jpeg)
+ find_library(JPEG_LIBRARY
+ NAMES jpeg
+ PATHS ${MG_OEM_WORK_DIR}/gd/jpeg/.libs)
+ message(STATUS "libjpeg Include Dir: ${JPEG_INCLUDE_DIR}")
+ message(STATUS "libjpeg Library: ${JPEG_LIBRARY}")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(jpeg DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR)
+ mark_as_advanced(JPEG_INCLUDE_DIR JPEG_LIBRARY)
+ else (INTERNAL_JPEG)
+ find_package(JPEG REQUIRED)
+ endif (INTERNAL_JPEG)
+ if (INTERNAL_PNG)
+ message(STATUS "Using internal libpng")
+ #find_package(PNG REQUIRED
+ # PATHS ${MG_OEM_WORK_DIR}/gd/png
+ # ${MG_OEM_WORK_DIR}/gd/png/.libs)
+ find_path(PNG_INCLUDE_DIRS
+ NAMES "png.h"
+ PATHS ${MG_OEM_WORK_DIR}/gd/lpng)
+ find_library(PNG_LIBRARY
+ NAMES png
+ PATHS ${MG_OEM_WORK_DIR}/gd/lpng/.libs)
+ message(STATUS "libpng Include Dir: ${PNG_INCLUDE_DIRS}")
+ message(STATUS "libpng Library: ${PNG_LIBRARY}")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(libpng DEFAULT_MSG PNG_LIBRARY PNG_INCLUDE_DIRS)
+ mark_as_advanced(PNG_INCLUDE_DIRS PNG_LIBRARY)
+ else (INTERNAL_PNG)
+ find_package(PNG REQUIRED)
+ endif (INTERNAL_PNG)
+
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
if (INTERNAL_JSON)
message(STATUS "Using internal jsoncpp")
find_path(JsonCpp_INCLUDE_DIR
@@ -169,25 +173,29 @@
find_package(JsonCpp REQUIRED)
endif (INTERNAL_JSON)
-if (INTERNAL_ZLIB)
- message(STATUS "Using internal zlib")
- find_path(ZLIB_INCLUDE_DIR
- NAMES "zlib.h"
- PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
- find_library(ZLIB_LIBRARY
- NAMES z
- PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
- message(STATUS "zlib Include Dir: ${ZLIB_INCLUDE_DIR}")
- message(STATUS "zlib Library: ${ZLIB_LIBRARY}")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
- mark_as_advanced(ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
-else (INTERNAL_ZLIB)
- find_package(ZLIB REQUIRED)
-endif (INTERNAL_ZLIB)
+if (NOT MG_COMMON_SUBSET_ONLY)
-find_package(FDO REQUIRED)
-find_package(TCLAP REQUIRED)
-find_package(CppHttpLib REQUIRED)
-find_package(LinuxApt REQUIRED)
-find_package(DbXmlInternal REQUIRED)
-find_package(Ant REQUIRED)
\ No newline at end of file
+ if (INTERNAL_ZLIB)
+ message(STATUS "Using internal zlib")
+ find_path(ZLIB_INCLUDE_DIR
+ NAMES "zlib.h"
+ PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
+ find_library(ZLIB_LIBRARY
+ NAMES z
+ PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
+ message(STATUS "zlib Include Dir: ${ZLIB_INCLUDE_DIR}")
+ message(STATUS "zlib Library: ${ZLIB_LIBRARY}")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+ mark_as_advanced(ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
+ else (INTERNAL_ZLIB)
+ find_package(ZLIB REQUIRED)
+ endif (INTERNAL_ZLIB)
+
+ find_package(FDO REQUIRED)
+ find_package(TCLAP REQUIRED)
+ find_package(CppHttpLib REQUIRED)
+ find_package(LinuxApt REQUIRED)
+ find_package(DbXmlInternal REQUIRED)
+ find_package(Ant REQUIRED)
+
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/cmake_bootstrap.sh
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/cmake_bootstrap.sh 2020-08-26 15:48:58 UTC (rev 9724)
@@ -10,6 +10,7 @@
INTERNAL_GD=0
INTERNAL_JSON=0
INTERNAL_GEOS=0
+COMMON_SUBSET_ONLY=0
BUILD_CPU=32
BUILD_CONFIG=Release
HAVE_SYSTEM_XERCES=0
@@ -28,6 +29,9 @@
BUILD_CONFIG=$2
shift
;;
+ --common-subset-only)
+ COMMON_SUBSET_ONLY=1
+ ;;
--with-all-internal)
INTERNAL_ACE=1
INTERNAL_CPPUNIT=1
@@ -126,15 +130,16 @@
echo "Using system xerces: $HAVE_SYSTEM_XERCES"
echo "OEM Working Directory is: $OEM_WORK_DIR"
echo "Using ccache: $USE_CCACHE"
-echo "INTERNAL_ACE = $INTERNAL_ACE"
-echo "INTERNAL_CPPUNIT = $INTERNAL_CPPUNIT"
-echo "INTERNAL_ZLIB = $INTERNAL_ZLIB"
-echo "INTERNAL_LIBPNG = $INTERNAL_LIBPNG"
-echo "INTERNAL_JPEG = $INTERNAL_JPEG"
-echo "INTERNAL_FREETYPE = $INTERNAL_FREETYPE"
-echo "INTERNAL_GD = $INTERNAL_GD"
-echo "INTERNAL_JSON = $INTERNAL_JSON"
-echo "INTERNAL_GEOS = $INTERNAL_GEOS"
+echo "INTERNAL_ACE = $INTERNAL_ACE"
+echo "INTERNAL_CPPUNIT = $INTERNAL_CPPUNIT"
+echo "INTERNAL_ZLIB = $INTERNAL_ZLIB"
+echo "INTERNAL_LIBPNG = $INTERNAL_LIBPNG"
+echo "INTERNAL_JPEG = $INTERNAL_JPEG"
+echo "INTERNAL_FREETYPE = $INTERNAL_FREETYPE"
+echo "INTERNAL_GD = $INTERNAL_GD"
+echo "INTERNAL_JSON = $INTERNAL_JSON"
+echo "INTERNAL_GEOS = $INTERNAL_GEOS"
+echo "COMMON_SUBSET_ONLY = $COMMON_SUBSET_ONLY"
if [ "$USE_CCACHE" = "1" ]; then
export CC="ccache gcc"
@@ -168,7 +173,7 @@
env ACE_ROOT="${ACE_PATH}" make buildbits=$ace_buildbits debug=$ace_debug optimize=$ace_optimize
check_build
fi
-if [ "$INTERNAL_CPPUNIT" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_CPPUNIT" = "1" ]; then
echo "Building CppUnit (internal)"
cp -Rf "${SOURCE_DIR}/Oem/CppUnit-1.9.14" "${OEM_WORK_DIR}/CppUnit"
cd "${OEM_WORK_DIR}/CppUnit" || exit
@@ -183,7 +188,7 @@
check_build
fi
mkdir -p "${OEM_WORK_DIR}/gd"
-if [ "$INTERNAL_ZLIB" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_ZLIB" = "1" ]; then
echo "Building zlib (internal)"
cp -Rf "${SOURCE_DIR}/Oem/gd/zlib" "${OEM_WORK_DIR}/gd/zlib"
cd "${OEM_WORK_DIR}/gd/zlib" || exit
@@ -197,7 +202,7 @@
make && make install
check_build
fi
-if [ "$INTERNAL_LIBPNG" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_LIBPNG" = "1" ]; then
echo "Building libpng (internal)"
cp -Rf "${SOURCE_DIR}/Oem/gd/lpng" "${OEM_WORK_DIR}/gd/lpng"
cd "${OEM_WORK_DIR}/gd/lpng" || exit
@@ -213,7 +218,7 @@
check_build
fi
fi
-if [ "$INTERNAL_JPEG" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_JPEG" = "1" ]; then
echo "Building libjpeg (internal)"
cp -Rf "${SOURCE_DIR}/Oem/gd/jpeg" "${OEM_WORK_DIR}/gd/jpeg"
cd "${OEM_WORK_DIR}/gd/jpeg" || exit
@@ -238,7 +243,7 @@
check_build
fi
fi
-if [ "$INTERNAL_FREETYPE" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_FREETYPE" = "1" ]; then
echo "Building freetype (internal)"
cp -Rf "${SOURCE_DIR}/Oem/gd/freetype" "${OEM_WORK_DIR}/gd/freetype"
cd "${OEM_WORK_DIR}/gd/freetype" || exit
@@ -269,7 +274,7 @@
PHP_ZLIB_DIR="$OEM_WORK_DIR/install/zlib"
fi
-if [ "$INTERNAL_GD" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_GD" = "1" ]; then
echo "Building GD (internal)"
cp -Rf "${SOURCE_DIR}/Oem/gd/gd" "${OEM_WORK_DIR}/gd/gd"
cd "${OEM_WORK_DIR}/gd/gd" || exit
@@ -345,6 +350,9 @@
echo "Has DBXML Library: $HAS_DBXML_LIB"
echo "Has XQilla Library: $HAS_XQILLA_LIB"
+# Even if building the common libs subset, xerces is wedded to the dbxml build script, so we have to build
+# the lot
+#
# (Re)build DBXML if any of the above is false
if test $HAS_DBXML_HEADERS -eq 0 -o $HAS_DBCXX_LIB -eq 0 -o $HAS_DBXML_LIB -eq 0 -o $HAS_XQILLA_LIB -eq 0; then
echo "Re-building DBXML (${BUILD_CONFIG})"
@@ -436,4 +444,7 @@
fi
echo "$OEM_WORK_DIR/env_vars.sh written"
-echo "Make sure to run cmake_linuxapt.sh next with --oem-working-dir set to: $OEM_WORK_DIR"
\ No newline at end of file
+echo "Make sure to run cmake_linuxapt.sh next with --oem-working-dir set to: $OEM_WORK_DIR"
+if [ "$COMMON_SUBSET_ONLY" != "1" ]; then
+ echo "If you are only building the common libs subset, you may ignore the above statement"
+fi
\ No newline at end of file
Modified: trunk/MgDev/cmake_build.sh
===================================================================
--- trunk/MgDev/cmake_build.sh 2020-08-25 12:03:57 UTC (rev 9723)
+++ trunk/MgDev/cmake_build.sh 2020-08-26 15:48:58 UTC (rev 9724)
@@ -9,6 +9,7 @@
MG_VERSION_MINOR=0
MG_VERSION_RELEASE=0
MG_REV=0
+COMMON_SUBSET_ONLY=0
while [ $# -gt 0 ]; do # Until you run out of parameters...
case "$1" in
@@ -36,6 +37,9 @@
MG_REV=$2
shift
;;
+ --common-subset-only)
+ COMMON_SUBSET_ONLY=1
+ ;;
--ninja)
USE_NINJA=1
;;
@@ -100,6 +104,7 @@
echo "CMake build directory is: $CMAKE_BUILD_DIR"
echo "OEM Working Directory is: $OEM_WORK_DIR"
echo "LinuxApt Working Directory is: $LINUXAPT_WORK_DIR"
+echo "Building common libs only: $COMMON_SUBSET_ONLY"
echo "Creating CMake build directory"
mkdir -p "$CMAKE_BUILD_DIR"
@@ -113,10 +118,10 @@
echo "Setting up CMake in: $CMAKE_BUILD_DIR"
cd "$CMAKE_BUILD_DIR" || exit
if test $USE_NINJA -eq 1; then
- cmake -G Ninja "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS
+ cmake -G Ninja "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
check_build
else
- cmake "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS
+ cmake "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
check_build
fi
cmake --build .
More information about the mapguide-commits
mailing list