Skip to content

Commit 5c2006a

Browse files
committed
cmake path convenience
1 parent 10999e4 commit 5c2006a

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

Superbuild/Superbuild.cmake

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -138,46 +138,46 @@ IF(NOT BUILD_HEADLESS)
138138
# ------------------------------------------------------------
139139
# Platform-specific Qt auto-detection
140140
# ------------------------------------------------------------
141-
#if(APPLE OR WIN32 OR (UNIX AND NOT APPLE))
142-
#
143-
# if(NOT Qt_PATH OR NOT IS_DIRECTORY "${Qt_PATH}")
144-
#
145-
# if(APPLE)
146-
# set(_qt_default "/Users/basisunus/Qt/6.10.2/macos")
147-
# elseif(WIN32)
148-
# set(_qt_default "C:/Qt/6.10.1/msvc2022_64")
149-
# elseif(UNIX)
150-
# set(_qt_default "$ENV{HOME}/Qt/6.11.0/gcc_64")
151-
# endif()
152-
#
153-
# if(IS_DIRECTORY "${_qt_default}")
154-
# message(STATUS
155-
# "Qt_PATH not set or invalid — using auto-detected Qt: ${_qt_default}"
156-
# )
157-
#
158-
# set(Qt_PATH "${_qt_default}" CACHE PATH "Qt install prefix" FORCE)
159-
#
160-
# # Auto-detect Qt version from path
161-
# get_filename_component(_qt_parent "${_qt_default}" DIRECTORY)
162-
# get_filename_component(_qt_version "${_qt_parent}" NAME)
163-
#
164-
# set(SCIRUN_QT_MIN_VERSION
165-
# "${_qt_version}"
166-
# CACHE STRING "Qt version" FORCE)
167-
#
168-
# string(REPLACE "." ";" SCIRUN_QT_MIN_VERSION_LIST
169-
# ${SCIRUN_QT_MIN_VERSION})
170-
#
171-
# list(GET SCIRUN_QT_MIN_VERSION_LIST 0 QT_VERSION_MAJOR)
172-
# list(GET SCIRUN_QT_MIN_VERSION_LIST 1 QT_VERSION_MINOR)
173-
# list(GET SCIRUN_QT_MIN_VERSION_LIST 2 QT_VERSION_PATCH)
174-
#
175-
# endif()
176-
# else()
177-
# message(STATUS "Using user-provided Qt_PATH: ${Qt_PATH}")
178-
# endif()
179-
#
180-
#endif()
141+
if(APPLE OR WIN32 OR (UNIX AND NOT APPLE))
142+
143+
if(NOT Qt_PATH OR NOT IS_DIRECTORY "${Qt_PATH}")
144+
145+
if(APPLE)
146+
set(_qt_default "/Users/basisunus/Qt/6.10.2/macos")
147+
elseif(WIN32)
148+
set(_qt_default "C:/Qt/6.10.1/msvc2022_64")
149+
elseif(UNIX)
150+
set(_qt_default "$ENV{HOME}/Qt/6.11.0/gcc_64")
151+
endif()
152+
153+
if(IS_DIRECTORY "${_qt_default}")
154+
message(STATUS
155+
"Qt_PATH not set or invalid — using auto-detected Qt: ${_qt_default}"
156+
)
157+
158+
set(Qt_PATH "${_qt_default}" CACHE PATH "Qt install prefix" FORCE)
159+
160+
# Auto-detect Qt version from path
161+
get_filename_component(_qt_parent "${_qt_default}" DIRECTORY)
162+
get_filename_component(_qt_version "${_qt_parent}" NAME)
163+
164+
set(SCIRUN_QT_MIN_VERSION
165+
"${_qt_version}"
166+
CACHE STRING "Qt version" FORCE)
167+
168+
string(REPLACE "." ";" SCIRUN_QT_MIN_VERSION_LIST
169+
${SCIRUN_QT_MIN_VERSION})
170+
171+
list(GET SCIRUN_QT_MIN_VERSION_LIST 0 QT_VERSION_MAJOR)
172+
list(GET SCIRUN_QT_MIN_VERSION_LIST 1 QT_VERSION_MINOR)
173+
list(GET SCIRUN_QT_MIN_VERSION_LIST 2 QT_VERSION_PATCH)
174+
175+
endif()
176+
else()
177+
message(STATUS "Using user-provided Qt_PATH: ${Qt_PATH}")
178+
endif()
179+
180+
endif()
181181

182182
# ------------------------------------------------------------
183183
# Qt package discovery

0 commit comments

Comments
 (0)