[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r9735 - trunk/MgDev/Oem/CsMapLibrary
From: svn_mapguide () osgeo ! org
Date: 2020-09-17 12:02:35
Message-ID: 20200917120235.4C58614E344 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2020-09-17 05:02:35 -0700 (Thu, 17 Sep 2020)
New Revision: 9735
Modified:
trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
Log:
#2819: Fix CS-Map build. We still need to copy data files to staging area for \
post-build to work properly
Modified: trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt 2020-09-17 11:54:54 UTC (rev 9734)
+++ trunk/MgDev/Oem/CsMapLibrary/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
@@ -170,40 +170,41 @@
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})
+
+file(GLOB CS_MAP_ROOT_FILES "${CSMAP_DICT_STAGING_DIR}/Dictionaries/*.*")
+
# Only install data files if not building for the common subset profile
if (NOT MG_COMMON_SUBSET_ONLY)
- 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
_______________________________________________
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