[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r9734 - in trunk/MgDev: Common Oem/CsMapLibrary Web/src
From: svn_mapguide () osgeo ! org
Date: 2020-09-17 11:54:55
Message-ID: 20200917115455.1F48114DC6C () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2020-09-17 04:54:54 -0700 (Thu, 17 Sep 2020)
New Revision: 9734
Modified:
trunk/MgDev/Common/CMakeLists.txt
trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
trunk/MgDev/Web/src/CMakeLists.txt
Log:
Install headers for common libs subset. Fixes #2819
Modified: trunk/MgDev/Common/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/CMakeLists.txt 2020-09-17 09:59:15 UTC (rev 9733)
+++ trunk/MgDev/Common/CMakeLists.txt 2020-09-17 11:54:54 UTC (rev 9734)
@@ -39,6 +39,13 @@
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}) +else (NOT MG_COMMON_SUBSET_ONLY)
+ # The common subset profile is geared towards SWIG wrappers, so we need the \
relevant headers as well + install(
+ DIRECTORY Foundation Geometry PlatformBase MapGuideCommon
+ DESTINATION ${MG_INSTALL_PREFIX}/include/Common
+ FILES_MATCHING PATTERN *.h
+ )
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
+configure_file(${CMAKE_MODULE_PATH}/../configs/ProductVersion.h.in \
${MG_AUTO_GENERATED_HEADER_DIR}/ProductVersion.h)
Modified: trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt 2020-09-17 09:59:15 UTC (rev 9733)
+++ trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt 2020-09-17 11:54:54 UTC (rev 9734)
@@ -170,62 +170,67 @@
COMMENT "Compile dictionaries"
)
-file(COPY ${CSMAP_DICT_SRC_DIR} DESTINATION ${CSMAP_DICT_STAGING_DIR})
-# Remove junk we know to not be related to dictionary data
-if (CSMAP_NO_GRID)
- file(GLOB_RECURSE CSMAP_JUNK_FILES
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.c"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.cnt"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.HLP"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.mak"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.nmk"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/WW15MGH.GRD"
- # FIXME: Though this removes the files it still leaves the empty directories
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Australia/Gda94/*.*"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid03/*.*"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid96/*.*"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid99/*.*"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/NSRS2007/*.*"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/NSRS2011/*.*"
- )
-else (CSMAP_NO_GRID)
- file(GLOB_RECURSE CSMAP_JUNK_FILES
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.c"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.cnt"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.HLP"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.mak"
- "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.nmk"
- )
-endif (CSMAP_NO_GRID)
-#message(STATUS "Removing CS-Map junk: ${CSMAP_JUNK_FILES}")
-file(REMOVE ${CSMAP_JUNK_FILES})
+# Only install data files if not building for the common subset profile
+if (NOT MG_COMMON_SUBSET_ONLY)
-file(GLOB CS_MAP_ROOT_FILES "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.*")
-#message(STATUS "CS-Map root files: ${CS_MAP_ROOT_FILES}")
-install(FILES ${CS_MAP_ROOT_FILES} DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} \
COMPONENT ${MG_COMPONENT_COMMON})
-# NOTE: These .csd files below are generated as a post-build so they aren't caught \
by the initial GLOB above
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Category.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Coordsys.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Datums.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Elipsoid.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/GeodeticPath.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(FILES ${CSMAP_DICT_STAGING_DIR}/Dictionaries/GeodeticTransform.CSD \
DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} COMPONENT \
${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Australia DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Brazil DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Canada DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/France DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Germany DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Japan DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/NewZealand DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Portugal DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Spain DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Switzerland DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/UK DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-if (CSMAP_NO_GRID)
- install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Harn DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON})
- install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Nadcon DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON})
- install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Vertcon DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON})
-else (CSMAP_NO_GRID)
- install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON})
-endif (CSMAP_NO_GRID)
-install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Venezuela DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) \ No newline at end \
of file + file(COPY ${CSMAP_DICT_SRC_DIR} DESTINATION ${CSMAP_DICT_STAGING_DIR})
+ # Remove junk we know to not be related to dictionary data
+ if (CSMAP_NO_GRID)
+ file(GLOB_RECURSE CSMAP_JUNK_FILES
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.c"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.cnt"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.HLP"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.mak"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.nmk"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/WW15MGH.GRD"
+ # FIXME: Though this removes the files it still leaves the empty \
directories + "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Australia/Gda94/*.*"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid03/*.*"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid96/*.*"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Geoid99/*.*"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/NSRS2007/*.*"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/NSRS2011/*.*"
+ )
+ else (CSMAP_NO_GRID)
+ file(GLOB_RECURSE CSMAP_JUNK_FILES
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.c"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.cnt"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.HLP"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.mak"
+ "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.nmk"
+ )
+ endif (CSMAP_NO_GRID)
+ #message(STATUS "Removing CS-Map junk: ${CSMAP_JUNK_FILES}")
+ file(REMOVE ${CSMAP_JUNK_FILES})
+
+ file(GLOB CS_MAP_ROOT_FILES "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.*")
+ #message(STATUS "CS-Map root files: ${CS_MAP_ROOT_FILES}")
+ install(FILES ${CS_MAP_ROOT_FILES} DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} \
COMPONENT ${MG_COMPONENT_COMMON}) + # NOTE: These .csd files below are generated \
as a post-build so they aren't caught by the initial GLOB above + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Category.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Coordsys.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Datums.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Elipsoid.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/GeodeticPath.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + install(FILES \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/GeodeticTransform.CSD DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Australia DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Brazil DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Canada DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/France DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Germany DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Japan DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/NewZealand DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Portugal DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Spain DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Switzerland DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/UK DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + if \
(CSMAP_NO_GRID) + install(DIRECTORY \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Harn DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Nadcon DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON}) + \
install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa/Vertcon DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX}/Usa COMPONENT ${MG_COMPONENT_COMMON}) + else \
(CSMAP_NO_GRID) + install(DIRECTORY ${CSMAP_DICT_STAGING_DIR}/Dictionaries/Usa \
DESTINATION ${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) + \
endif (CSMAP_NO_GRID) + install(DIRECTORY \
${CSMAP_DICT_STAGING_DIR}/Dictionaries/Venezuela DESTINATION \
${MG_INSTALL_COORDSYS_PREFIX} COMPONENT ${MG_COMPONENT_COMMON}) +
+endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/CMakeLists.txt 2020-09-17 09:59:15 UTC (rev 9733)
+++ trunk/MgDev/Web/src/CMakeLists.txt 2020-09-17 11:54:54 UTC (rev 9734)
@@ -41,4 +41,11 @@
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
+else (NOT MG_COMMON_SUBSET_ONLY)
+ # The common subset profile is geared towards SWIG wrappers, so we need the \
relevant headers as well + install(
+ DIRECTORY WebApp HttpHandler
+ DESTINATION ${MG_INSTALL_PREFIX}/include/Web
+ FILES_MATCHING PATTERN *.h
+ )
+endif (NOT MG_COMMON_SUBSET_ONLY)
_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/mapguide-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic