Repository navigation
Conversation
Co-authored-by: Junie <junie@jetbrains.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Phase 1 of the CMake migration plan: CMake foundation and the
MapWinGIS.CoreDLL. The MSBuild.slnxbuild is unchanged and stays the supported build until the later phases land.Changes
CMakeLists.txt(CMake 3.28+,project(MapWinGIS6 VERSION 6.0.0 LANGUAGES C CXX)), restricted toDebug;Release.cmake/MwgVcpkg.cmake: runs beforeproject(). Resolves the vcpkg root (MWG_VCPKG_ROOT,../vcpkg,VCPKG_ROOT, asbootstrap-vcpkg.ps1does), pins the triplets, and uses its own install treevcpkg_installed/cmake-<Platform>. Thetestsfeature followsMWG_BUILD_TESTS.cmake/MwgPlatform.cmake: checks MSVC ≥ 19.50 (v145), that the architecture matches the triplet (a fatal error with a CLion hint), and the Windows SDK (pinned for VS, a warning under Ninja).cmake/MwgFlagOverrides.cmakeandcmake/MwgCompilerOptions.cmake: CMake's MSVC default flags (/DWIN32 /D_WINDOWS ...) are cleared, andmwg_apply_common_options()applies the audited MSBuild optionsPRIVATEper target. That includes_WINDLL,/JMC, PDBs in Release, and the Win32 defaults/Oy- /analyze- /SAFESEH.cmake/MwgRuntimeDeploy.cmake:MapWinGIS.RuntimeDatacopiesshare/gdal→gdal-dataandshare/proj→proj, using a stamp file. It keepsMWG_DEPLOY_RUNTIME_DATAand the missing-data warning.src/MapWinGIS.Core/CMakeLists.txt: explicit source lists withsource_group(TREE),PUBLIC include/,PRIVATE src/,DEFINE_SYMBOL MWG_CORE_BUILD, andPRIVATE GDAL::GDAL GEOS::geos_c.CMakePresets.json: Ninjax64-debug|releaseandx86-debug|release, plusvs2026-x64|x86(-T v145), with matching build and test presets. Output goes toout/b/<preset>/bin, never tobin/.BUILDING.md, parity status inCMAKE-MIGRATION.md.Verification
dumpbin: identical dependents, 260 exports, subsystem and DLL characteristics. The embedded manifest is byte-identical.Debug|x64still builds; 173 tests run (170 pass, 3 skipped as before). The two output trees don't overlap.RelWithDebInfoand an architecture/triplet mismatch.Explained differences
The manifest switches are handled by CMake's link wrapper. vcpkg auto-link is replaced by explicit imported targets.
odbc32/odbccp32are unused MSBuild defaults, and/TLBID:1only matters for the OCX. The imported targets add/I.../include/geosand, in Debug,GDAL_DEBUG.Known limitations
Dependencies
Stacked on #39 (Phase 0,
cmake-phase-0-audit).