[mapguide-commits] r10003 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-11-01 08:03:47 -0700 (Tue, 01 Nov 2022)
New Revision: 10003

Modified:
   trunk/MgDev/CMakeLists.txt
   trunk/MgDev/cmake_build.sh
Log:
#2855: Fix cmake_build.sh not passing MG version numbers, meaning on Linux the MG version is always the base 4.0.0.0

Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt	2022-11-01 10:29:04 UTC (rev 10002)
+++ trunk/MgDev/CMakeLists.txt	2022-11-01 15:03:47 UTC (rev 10003)
@@ -74,6 +74,9 @@
 set(MG_VERSION "${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.${MG_VERSION_RELEASE}")
 set(MG_VERSION_FULL "${MG_VERSION}.${MG_VERSION_REV}")
 
+message(STATUS "MapGuide Version: ${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.${MG_VERSION_RELEASE}.${MG_VERSION_REV}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 set(MG_HTTPD_PORT 8008)
 set(MG_TOMCAT_PORT 8009)
 

Modified: trunk/MgDev/cmake_build.sh
===================================================================
--- trunk/MgDev/cmake_build.sh	2022-11-01 10:29:04 UTC (rev 10002)
+++ trunk/MgDev/cmake_build.sh	2022-11-01 15:03:47 UTC (rev 10003)
@@ -118,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_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
+    cmake -G Ninja "$SOURCE_DIR" -DMG_VERSION_MAJOR=$MG_VERSION_MAJOR -DMG_VERSION_MINOR=$MG_VERSION_MINOR -DMG_VERSION_RELEASE=$MG_VERSION_RELEASE -DMG_VERSION_REV=$MG_REV -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_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_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
+    cmake "$SOURCE_DIR" -DMG_VERSION_MAJOR=$MG_VERSION_MAJOR -DMG_VERSION_MINOR=$MG_VERSION_MINOR -DMG_VERSION_RELEASE=$MG_VERSION_RELEASE -DMG_VERSION_REV=$MG_REV -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_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 .