[mapguide-commits] r10001 - in trunk/MgDev: Bindings/src cmake/modules

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-11-01 03:23:23 -0700 (Tue, 01 Nov 2022)
New Revision: 10001

Modified:
   trunk/MgDev/Bindings/src/CMakeLists.txt
   trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake
Log:
#2852: Linux build fixes:
 - Refine internal zlib build and detection to only want static lib
 - Ask for SWIG 4.1 instead of SWIG 4.0

Modified: trunk/MgDev/Bindings/src/CMakeLists.txt
===================================================================
--- trunk/MgDev/Bindings/src/CMakeLists.txt	2022-10-31 17:01:48 UTC (rev 10000)
+++ trunk/MgDev/Bindings/src/CMakeLists.txt	2022-11-01 10:23:23 UTC (rev 10001)
@@ -16,7 +16,7 @@
     endif (NEED_LIBRT)
 endif( CMAKE_COMPILER_IS_GNUCXX )
 
-find_package(SWIG 4.0)
+find_package(SWIG 4.1)
 set(IMAKE_TOOL ${CMAKE_CURRENT_BINARY_DIR}/IMake/IMake)
 
 file(COPY "SwigCommon" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

Modified: trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake
===================================================================
--- trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake	2022-10-31 17:01:48 UTC (rev 10000)
+++ trunk/MgDev/cmake/modules/FindMapGuideThirdparty.cmake	2022-11-01 10:23:23 UTC (rev 10001)
@@ -181,7 +181,7 @@
             NAMES "zlib.h"
             PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
         find_library(ZLIB_LIBRARY
-            NAMES z
+            NAMES libz.a # Want static
             PATHS ${MG_OEM_WORK_DIR}/gd/zlib)
         message(STATUS "zlib Include Dir: ${ZLIB_INCLUDE_DIR}")
         message(STATUS "zlib Library: ${ZLIB_LIBRARY}")