Repository navigation
CMake Introduce CMake as the Primary Build System for MapWinGIS6 #41
+297
−22
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
| # | ||
| # mwg_add_midl_target(<target> IDL <file.idl> [OUTPUT_DIR <dir>] [DEPENDS <file>...]) | ||
| # | ||
| # Runs midl.exe through one explicit custom command for every generator (only | ||
| # the Visual Studio generators understand .idl sources), see | ||
| # docs/CMAKE-MIGRATION.md (D3). Creates: | ||
| # | ||
| # <target> custom target that owns the MIDL invocation | ||
| # <target>.Generated INTERFACE library: the MIDL output include directory, | ||
| # for the OCX and the tests | ||
| # | ||
| # and sets, in the caller's scope: | ||
| # <target>_HEADER <name>_i.h | ||
| # <target>_IID <name>_i.c (C, compile with the consumer) | ||
| # <target>_TLB <name>.tlb | ||
| # <target>_DIR output directory | ||
| # | ||
| # The options match the MSBuild Midl task: /W1 /char signed /env x64|win32 | ||
| # /target "NT60". This IDL declares no non-automation interfaces, so MIDL | ||
| # writes no proxy or dlldata file; they are redirected into the output | ||
| # directory anyway and are not declared as outputs. | ||
|
|
||
| function(_mwg_find_midl out_var) | ||
| # The MSBuild Midl task uses the SDK's x86 midl.exe; any host build works. | ||
| set(hints "") | ||
| if(CMAKE_RC_COMPILER) | ||
| get_filename_component(rc_dir "${CMAKE_RC_COMPILER}" DIRECTORY) | ||
| get_filename_component(sdk_bin "${rc_dir}" DIRECTORY) | ||
| list(APPEND hints "${rc_dir}" "${sdk_bin}/x64" "${sdk_bin}/x86") | ||
| endif() | ||
| find_program(MWG_MIDL_EXECUTABLE midl HINTS ${hints} DOC "MIDL compiler from the Windows SDK") | ||
| if(NOT MWG_MIDL_EXECUTABLE) | ||
| message(FATAL_ERROR | ||
| "midl.exe was not found. It ships with the Windows SDK ${MWG_WINDOWS_SDK}; " | ||
| "configure from a Visual Studio toolchain (CLion) or a VS 2026 Developer PowerShell.") | ||
| endif() | ||
| set(${out_var} "${MWG_MIDL_EXECUTABLE}" PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
| function(mwg_add_midl_target target) | ||
| cmake_parse_arguments(PARSE_ARGV 1 arg "" "IDL;OUTPUT_DIR" "DEPENDS") | ||
| if(NOT arg_IDL) | ||
| message(FATAL_ERROR "mwg_add_midl_target: IDL is required") | ||
| endif() | ||
| if(NOT arg_OUTPUT_DIR) | ||
| set(arg_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/midl") | ||
| endif() | ||
|
|
||
| _mwg_find_midl(midl) | ||
|
|
||
| # MIDL preprocesses the IDL with cl.exe, which it finds on PATH only. The | ||
| # Ninja generator inherits the vcvars PATH; the Visual Studio generators | ||
| # run custom commands in an MSBuild environment that has it. A plain shell | ||
| # with a cl.exe from CMAKE_C_COMPILER is not enough. | ||
| if(NOT CMAKE_GENERATOR MATCHES "^Visual Studio") | ||
| find_program(_mwg_cl_on_path cl NO_CACHE NO_DEFAULT_PATH PATHS ENV PATH) | ||
| if(NOT _mwg_cl_on_path) | ||
| message(FATAL_ERROR | ||
| "cl.exe is not on PATH, but midl.exe needs it to preprocess ${arg_IDL}.\n" | ||
| "Use a Visual Studio toolchain in CLion, or configure and build from a " | ||
| "VS 2026 Developer PowerShell (vcvarsall.bat).") | ||
| endif() | ||
| endif() | ||
|
|
||
| cmake_path(ABSOLUTE_PATH arg_IDL BASE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" OUTPUT_VARIABLE idl) | ||
| # LAST_ONLY: MapWinGIS.ActiveX.idl -> MapWinGIS.ActiveX | ||
| cmake_path(GET idl STEM LAST_ONLY name) | ||
| cmake_path(GET idl PARENT_PATH idl_dir) | ||
|
|
||
| if(CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
| set(env x64) | ||
| else() | ||
| set(env win32) | ||
| endif() | ||
|
|
||
| set(header "${arg_OUTPUT_DIR}/${name}_i.h") | ||
|
There was a problem hiding this comment. Severity: Minor | Confidence: Medium Issue: The MSBuild |
||
| set(iid "${arg_OUTPUT_DIR}/${name}_i.c") | ||
| set(tlb "${arg_OUTPUT_DIR}/${name}.tlb") | ||
|
|
||
| add_custom_command( | ||
| OUTPUT "${header}" "${iid}" "${tlb}" | ||
|
There was a problem hiding this comment. Severity: Minor | Confidence: Medium Issue: |
||
| COMMAND "${CMAKE_COMMAND}" -E make_directory "${arg_OUTPUT_DIR}" | ||
| COMMAND "${midl}" /W1 /nologo /char signed /env ${env} /target NT60 | ||
| /I "${idl_dir}" | ||
| /out "${arg_OUTPUT_DIR}" | ||
| /h "${name}_i.h" | ||
| /iid "${name}_i.c" | ||
| /proxy "${name}_p.c" | ||
| /dlldata dlldata.c | ||
| /tlb "${name}.tlb" | ||
| "${idl}" | ||
| MAIN_DEPENDENCY "${idl}" | ||
| DEPENDS ${arg_DEPENDS} | ||
| WORKING_DIRECTORY "${idl_dir}" | ||
| COMMENT "MIDL ${name}.idl" | ||
| VERBATIM | ||
| ) | ||
|
|
||
| add_custom_target(${target} DEPENDS "${header}" "${iid}" "${tlb}" SOURCES "${idl}") | ||
| set_target_properties(${target} PROPERTIES FOLDER "src") | ||
|
|
||
|
There was a problem hiding this comment. Severity: Suggestion | Confidence: Low Issue: The build-directory path |
||
| add_library(${target}.Generated INTERFACE) | ||
| target_include_directories(${target}.Generated INTERFACE "${arg_OUTPUT_DIR}") | ||
| add_dependencies(${target}.Generated ${target}) | ||
|
|
||
| set(${target}_HEADER "${header}" PARENT_SCOPE) | ||
| set(${target}_IID "${iid}" PARENT_SCOPE) | ||
| set(${target}_TLB "${tlb}" PARENT_SCOPE) | ||
| set(${target}_DIR "${arg_OUTPUT_DIR}" PARENT_SCOPE) | ||
| endfunction() | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
| # | ||
| # MapWinGIS.ocx: thin ActiveX/COM wrapper over MapWinGIS.Core (static ATL, | ||
| # apartment threaded). | ||
|
|
||
| include(MwgMidl) | ||
|
|
||
| mwg_add_midl_target(MapWinGIS.ActiveX.Interface IDL MapWinGIS.ActiveX.idl) | ||
|
|
||
| # Compiled into the OCX and, with MWG_ENABLE_RENDERER_TEST_HOOKS, into the | ||
| # tests (docs/CMAKE-MIGRATION.md, D4). | ||
| set(MWG_ACTIVEX_SHARED_SOURCES | ||
| ComConversion.cpp | ||
| GdalOperationDispatcher.cpp | ||
| GdiVectorLayerRenderer.cpp | ||
| OpenGlVectorLayerRenderer.cpp | ||
| VectorLayerRenderer.cpp | ||
| ViewTransform.cpp | ||
| ) | ||
| list(TRANSFORM MWG_ACTIVEX_SHARED_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/" | ||
| OUTPUT_VARIABLE MWG_ACTIVEX_SHARED_SOURCES) | ||
| set(MWG_ACTIVEX_SHARED_SOURCES "${MWG_ACTIVEX_SHARED_SOURCES}" PARENT_SCOPE) | ||
|
|
||
| set(MWG_ACTIVEX_HEADERS | ||
| ActiveXModule.h | ||
| ComConversion.h | ||
| GdalDispatchWindow.h | ||
| GdalEventSource.h | ||
| GdalOperationDispatcher.h | ||
| GdiVectorLayerRenderer.h | ||
| MapWinGISControl.h | ||
| OpenGlVectorLayerRenderer.h | ||
| VectorLayerRenderer.h | ||
| VectorRenderBackend.h | ||
| ViewTransform.h | ||
| resource.h | ||
| ) | ||
|
|
||
| set(MWG_ACTIVEX_SOURCES | ||
| ActiveXModule.cpp | ||
| GdalEventSource.cpp | ||
| MapWinGISControl.cpp | ||
| ) | ||
|
|
||
| set(MWG_ACTIVEX_RESOURCES | ||
| MapWinGIS.ActiveX.rc | ||
| MapWinGIS.ActiveX.def | ||
| MapWinGISControl.rgs | ||
| ) | ||
|
|
||
| # SHARED, not MODULE: keeps the import library and the runtime-DLL handling. | ||
| add_library(MapWinGIS.ActiveX SHARED) | ||
|
|
||
| target_sources(MapWinGIS.ActiveX PRIVATE | ||
| ${MWG_ACTIVEX_HEADERS} | ||
| ${MWG_ACTIVEX_SOURCES} | ||
| ${MWG_ACTIVEX_SHARED_SOURCES} | ||
| ${MWG_ACTIVEX_RESOURCES} | ||
| "${MapWinGIS.ActiveX.Interface_HEADER}" | ||
| "${MapWinGIS.ActiveX.Interface_IID}" | ||
| ) | ||
| source_group("Header Files" FILES ${MWG_ACTIVEX_HEADERS}) | ||
| source_group("Source Files" FILES ${MWG_ACTIVEX_SOURCES} ${MWG_ACTIVEX_SHARED_SOURCES}) | ||
| source_group("Resource Files" FILES ${MWG_ACTIVEX_RESOURCES}) | ||
| source_group("Generated Files" FILES | ||
| "${MapWinGIS.ActiveX.Interface_HEADER}" | ||
| "${MapWinGIS.ActiveX.Interface_IID}") | ||
|
|
||
| # The .rc embeds the generated type library (1 TYPELIB "MapWinGIS.ActiveX.tlb"); | ||
| # rc's dependency scanner does not see it. | ||
| set_source_files_properties(MapWinGIS.ActiveX.rc PROPERTIES | ||
| OBJECT_DEPENDS "${MapWinGIS.ActiveX.Interface_TLB};${CMAKE_CURRENT_SOURCE_DIR}/MapWinGISControl.rgs") | ||
|
|
||
| target_link_libraries(MapWinGIS.ActiveX PRIVATE | ||
| MapWinGIS::Core | ||
| MapWinGIS.ActiveX.Interface.Generated | ||
| # Explicit Windows libraries (audit). ATL is static: atlbase.h links | ||
| # atls.lib through #pragma comment, and OpenGlVectorLayerRenderer.cpp links | ||
| # opengl32.lib the same way. | ||
| ole32 oleaut32 uuid user32 gdi32 advapi32 kernel32 | ||
| ) | ||
|
|
||
| target_compile_definitions(MapWinGIS.ActiveX PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:_ATL_APARTMENT_THREADED>") | ||
|
|
||
| # MSBuild ResourceCompile: /l 0x0409 and the MIDL output directory on the include path. | ||
| target_compile_options(MapWinGIS.ActiveX PRIVATE "$<$<COMPILE_LANGUAGE:RC>:/l0x0409>") | ||
|
|
||
| mwg_apply_common_options(MapWinGIS.ActiveX) | ||
|
|
||
| set_target_properties(MapWinGIS.ActiveX PROPERTIES | ||
| OUTPUT_NAME MapWinGIS | ||
| SUFFIX ".ocx" | ||
| # The COM entry points are exported through MapWinGIS.ActiveX.def; no | ||
| # <target>_EXPORTS macro, as in MSBuild. | ||
| DEFINE_SYMBOL "" | ||
| FOLDER "src" | ||
| ) | ||
|
|
||
| add_dependencies(MapWinGIS.ActiveX MapWinGIS.ActiveX.Interface) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Severity: Suggestion | Confidence: Medium
Issue: The ActiveX subdirectory is added unconditionally, and
mwg_add_midl_targethard-FATAL_ERRORs configure whenmidl.exeor acl.exeonPATHis missing. There is no way to configure a Core-only CMake build.Impact: Consumers who only want
MapWinGIS.Core.dll(headless Core CI, documentation or packaging jobs, contributors without the ATL/MIDL components installed) cannot configure the project at all, even though the Core target has no MIDL dependency.Fix: Add an
option(MWG_BUILD_ACTIVEX "Build the ActiveX control (requires the Windows SDK MIDL and ATL)" ON)and gate thisadd_subdirectory(and document the option indocs/BUILDING.md) on it.