Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -34,8 +34,8 @@ ELSE()
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
SET(_arcgis_include_hint "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include")
|
||||
SET(_arcgis_library_hint "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/linux/x64/lib")
|
||||
SET(_arcgis_include_hint "${CMAKE_SOURCE_DIR}/../../external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include")
|
||||
SET(_arcgis_library_hint "${CMAKE_SOURCE_DIR}/../../external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/linux/x64/lib")
|
||||
|
||||
SET(_arcgis_lib_dir $ENV{ARCGIS_LIB_DIR})
|
||||
SET(_arcgis_inc_dir $ENV{ARCGIS_INC_DIR})
|
||||
|
||||
@@ -28,8 +28,8 @@ endif()
|
||||
# Try config-mode: look for Grantlee5Config.cmake in CMAKE_PREFIX_PATH or installed location
|
||||
# Try to locate Grantlee5Config.cmake via common locations: CMAKE_PREFIX_PATH, EXTERNAL_DIR, repo/external, and typical install paths
|
||||
find_file(_Grantlee5Config NAMES Grantlee5Config.cmake
|
||||
PATHS ${CMAKE_PREFIX_PATH} $ENV{EXTERNAL_DIR} /repo/external /repo/external/grantlee /usr/local/lib/cmake/Grantlee5
|
||||
PATH_SUFFIXES Grantlee5 lib/cmake/Grantlee5)
|
||||
PATHS ${CMAKE_PREFIX_PATH} $ENV{EXTERNAL_DIR} ${CMAKE_SOURCE_DIR}/../external /home/torsten/swy/sandbox/external /repo/external /repo/external/grantlee /usr/local/lib/cmake/Grantlee5
|
||||
PATH_SUFFIXES grantlee/lib/cmake/Grantlee5 lib/cmake/Grantlee5)
|
||||
if(_Grantlee5Config)
|
||||
include(${_Grantlee5Config})
|
||||
if(TARGET Grantlee5::Templates)
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
|
||||
|
||||
# Qt6 only - no Qt5 fallback
|
||||
find_package(Qt6 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml QUIET)
|
||||
if(NOT Qt6_FOUND)
|
||||
set(KDReports_FOUND FALSE)
|
||||
return()
|
||||
endif()
|
||||
set(_qt_prefix "Qt6")
|
||||
|
||||
# If KDReports already provided via variables, use them
|
||||
|
||||
@@ -613,12 +613,17 @@ ENDMACRO()
|
||||
|
||||
|
||||
|
||||
MACRO(NGL_WRAP_UI)
|
||||
# Qt6 path: use qt6_wrap_ui
|
||||
if(TARGET Qt6::Core)
|
||||
qt6_wrap_ui(${ARGN})
|
||||
MACRO(NGL_WRAP_UI _out)
|
||||
# Qt6 path: use qt6_wrap_ui if available
|
||||
if(COMMAND qt6_wrap_ui)
|
||||
qt6_wrap_ui(${_out} ${ARGN})
|
||||
elseif(TARGET Qt6::Core)
|
||||
# Qt6 Core-only mode: UI files cannot be processed - stub for now
|
||||
message(WARNING "Qt6 Widgets not available - UI wrapping disabled, using stub")
|
||||
set(${_out} "${${_out}}" PARENT_SCOPE)
|
||||
else()
|
||||
QT5_WRAP_UI(${ARGN})
|
||||
# Qt5 fallback
|
||||
QT5_WRAP_UI(${_out} ${ARGN})
|
||||
endif()
|
||||
ENDMACRO()
|
||||
|
||||
|
||||
Reference in new issue
Block a user