Skip to content

Commit 1d15689

Browse files
committed
COMP: Fix cmake processing failure when option_name is empty
CMake Error at CMake/ctkMacroValidateBuildOptions.cmake:182 (if): if given arguments: AND NOT ON Unknown arguments specified Call Stack (most recent call first): CMakeLists.txt:857 (ctkMacroValidateBuildOptions)
1 parent 2df791c commit 1d15689

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMake/ctkMacroValidateBuildOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ macro(ctkMacroValidateBuildOptions dir executable target_directories)
179179
endif()
180180

181181
ctkMacroGetOptionName("${target_directories_with_target_name}" ${dep} dep_option)
182-
if(${${option_name}} AND NOT ${${dep_option}})
182+
if("${${option_name}}" AND NOT "${${dep_option}}")
183183
# Enable option
184184
message(STATUS "Enabling option [${dep_option}] required by [${target_project_name}]")
185185
set(${dep_option} ON CACHE BOOL "Enable ${target_project_name} library" FORCE)

CMakeExternals/PythonQt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
8282

8383
ctkFunctionExtractOptimizedLibrary(Python3_LIBRARIES PYTHON_LIBRARY)
8484
if(CTK_QT_VERSION VERSION_EQUAL "5")
85-
set(revision_tag 37b0d31e5d313f5682f774bd8d5d41f5018a2ce9) # patched-v3.6.1-2025-06-13-a2687828e
85+
set(revision_tag update-to-new-python3-find_package) # patched-v3.6.1-2025-06-13-a2687828e, with find_package(Python3 ) updates
8686
else()
8787
message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")
8888
endif()
@@ -98,7 +98,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
9898
set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
9999
GIT_TAG ${revision_tag})
100100
else()
101-
set(location_args GIT_REPOSITORY "https://github.com/commontk/PythonQt.git"
101+
set(location_args GIT_REPOSITORY "https://github.com/hjmjohnson/PythonQt.git"
102102
GIT_TAG ${revision_tag})
103103
endif()
104104

0 commit comments

Comments
 (0)