Skip to content
Snippets Groups Projects
Commit 68fafe58 authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri :speech_balloon:
Browse files

Use lowercase string for internal cmake variable name

parent 40c76627
No related branches found
No related tags found
No related merge requests found
......@@ -142,8 +142,8 @@ if (TARGET VTK::opengl)
set(VTK_OPENGL_HAS_EGL "@VTK_OPENGL_HAS_EGL@")
endif ()
if(@VTK_QT_MAJOR_VERSION@) # VTK_QT_VERSION
set("${CMAKE_FIND_PACKAGE_NAME}_QT_VERSION" "@VTK_QT_MAJOR_VERSION@")
if(@vtk_qt_major_version@) # VTK_QT_VERSION
set("${CMAKE_FIND_PACKAGE_NAME}_QT_VERSION" "@vtk_qt_major_version@")
endif ()
include("${CMAKE_CURRENT_LIST_DIR}/vtkModule.cmake")
......
......@@ -25,5 +25,5 @@ else()
set(_vtk_qt_version 5)
endif()
endif()
set(VTK_QT_MAJOR_VERSION ${_vtk_qt_version} CACHE INTERNAL
set(vtk_qt_major_version ${_vtk_qt_version} CACHE INTERNAL
"Major version number for the Qt installation used.")
......@@ -36,16 +36,16 @@ include(vtkQt)
set(qt_components
OpenGL
Widgets)
if(VTK_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6)
if(vtk_qt_major_version VERSION_GREATER_EQUAL 6)
list(APPEND qt_components OpenGLWidgets)
endif()
vtk_module_find_package(
PACKAGE "Qt${VTK_QT_MAJOR_VERSION}"
PACKAGE "Qt${vtk_qt_major_version}"
VERSION 5.9
COMPONENTS ${qt_components}
FORWARD_VERSION_REQ MINOR
VERSION_VAR "Qt${VTK_QT_MAJOR_VERSION}_VERSION")
VERSION_VAR "Qt${vtk_qt_major_version}_VERSION")
set(CMAKE_AUTOMOC 1)
......@@ -55,7 +55,7 @@ vtk_module_add_module(VTK::GUISupportQt
PRIVATE_HEADERS ${private_headers})
foreach(_qt_comp IN LISTS qt_components)
list(APPEND qt_modules "Qt${VTK_QT_MAJOR_VERSION}::${_qt_comp}")
list(APPEND qt_modules "Qt${vtk_qt_major_version}::${_qt_comp}")
endforeach()
vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS)
......
......@@ -54,7 +54,7 @@ vtk_add_test_cxx(vtkGUISupportQtCxxTests tests
TestQVTKOpenGLWidgetWithMSAA,TestQtWithMSAA.cxx
)
find_package("Qt${VTK_QT_MAJOR_VERSION}" COMPONENTS Widgets REQUIRED)
find_package("Qt${vtk_qt_major_version}" COMPONENTS Widgets REQUIRED)
vtk_test_cxx_executable(vtkGUISupportQtCxxTests tests
QTestApp.cxx
......@@ -62,7 +62,7 @@ vtk_test_cxx_executable(vtkGUISupportQtCxxTests tests
target_link_libraries(vtkGUISupportQtCxxTests
PRIVATE
"Qt${VTK_QT_MAJOR_VERSION}::Widgets")
"Qt${vtk_qt_major_version}::Widgets")
set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLStereoWidgetPicking
PROPERTIES RUN_SERIAL ON)
......
......@@ -10,9 +10,9 @@ vtk_module_add_module(VTK::GUISupportQtSQL
include(vtkQt)
vtk_module_find_package(
PACKAGE "Qt${VTK_QT_MAJOR_VERSION}"
PACKAGE "Qt${vtk_qt_major_version}"
COMPONENTS Widgets Sql
FORWARD_VERSION_REQ MINOR
VERSION_VAR "Qt${VTK_QT_MAJOR_VERSION}_VERSION")
VERSION_VAR "Qt${vtk_qt_major_version}_VERSION")
vtk_module_link(VTK::GUISupportQtSQL
PUBLIC "Qt${VTK_QT_MAJOR_VERSION}::Sql" "Qt${VTK_QT_MAJOR_VERSION}::Widgets")
PUBLIC "Qt${vtk_qt_major_version}::Sql" "Qt${vtk_qt_major_version}::Widgets")
......@@ -3,9 +3,9 @@ vtk_add_test_cxx(vtkGUISupportQtSQLCxxTests tests
TestQtSQLDatabase.cxx
)
find_package("Qt${VTK_QT_MAJOR_VERSION}" COMPONENTS Widgets REQUIRED)
find_package("Qt${vtk_qt_major_version}" COMPONENTS Widgets REQUIRED)
vtk_test_cxx_executable(vtkGUISupportQtSQLCxxTests tests)
target_link_libraries(vtkGUISupportQtSQLCxxTests
PRIVATE
"Qt${VTK_QT_MAJOR_VERSION}::Widgets")
"Qt${vtk_qt_major_version}::Widgets")
......@@ -11,8 +11,8 @@ vtk_module_add_module(VTK::RenderingQt
include(vtkQt)
vtk_module_find_package(
PACKAGE "Qt${VTK_QT_MAJOR_VERSION}"
PACKAGE "Qt${vtk_qt_major_version}"
COMPONENTS Widgets
FORWARD_VERSION_REQ MINOR
VERSION_VAR "Qt${VTK_QT_MAJOR_VERSION}_VERSION")
vtk_module_link(VTK::RenderingQt PUBLIC "Qt${VTK_QT_MAJOR_VERSION}::Widgets")
VERSION_VAR "Qt${vtk_qt_major_version}_VERSION")
vtk_module_link(VTK::RenderingQt PUBLIC "Qt${vtk_qt_major_version}::Widgets")
......@@ -9,14 +9,14 @@ set(classes
include(vtkQt)
vtk_module_find_package(
PACKAGE "Qt${VTK_QT_MAJOR_VERSION}"
PACKAGE "Qt${vtk_qt_major_version}"
COMPONENTS Widgets
FORWARD_VERSION_REQ MINOR
VERSION_VAR "Qt${VTK_QT_MAJOR_VERSION}_VERSION")
VERSION_VAR "Qt${vtk_qt_major_version}_VERSION")
set(CMAKE_AUTOMOC 1)
vtk_module_add_module(VTK::ViewsQt
CLASSES ${classes})
vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS)
vtk_module_link(VTK::ViewsQt PRIVATE "Qt${VTK_QT_MAJOR_VERSION}::Widgets")
vtk_module_link(VTK::ViewsQt PRIVATE "Qt${vtk_qt_major_version}::Widgets")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment