summaryrefslogtreecommitdiffstats
path: root/examples/opengl
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-12-08 17:25:35 +0100
committerKai Koehne <kai.koehne@qt.io>2021-12-13 14:16:26 +0000
commit80a76df1784a135fa1d86ac88f8c4d2dc6bf8c35 (patch)
tree5928602422ca953e6bbbdc51e72d0d3c68568b0d /examples/opengl
parent51f22a3a0495d8418a5d6dd0f09771c0347441b9 (diff)
Examples: Fix whitespace issues in CMakeLists.txt
Pick-to: 6.3 Change-Id: I8e6dd1f250f8be6016ee4164cb2ab7034cbb1203 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/opengl')
-rw-r--r--examples/opengl/2dpainting/CMakeLists.txt4
-rw-r--r--examples/opengl/computegles31/CMakeLists.txt5
-rw-r--r--examples/opengl/contextinfo/CMakeLists.txt4
-rw-r--r--examples/opengl/cube/CMakeLists.txt6
-rw-r--r--examples/opengl/hellogl2/CMakeLists.txt4
-rw-r--r--examples/opengl/hellogles3/CMakeLists.txt5
-rw-r--r--examples/opengl/hellowindow/CMakeLists.txt4
-rw-r--r--examples/opengl/openglwindow/CMakeLists.txt4
-rw-r--r--examples/opengl/paintedwindow/CMakeLists.txt4
-rw-r--r--examples/opengl/qopenglwidget/CMakeLists.txt5
-rw-r--r--examples/opengl/qopenglwindow/CMakeLists.txt5
-rw-r--r--examples/opengl/textures/CMakeLists.txt5
-rw-r--r--examples/opengl/threadedqopenglwidget/CMakeLists.txt4
13 files changed, 40 insertions, 19 deletions
diff --git a/examples/opengl/2dpainting/CMakeLists.txt b/examples/opengl/2dpainting/CMakeLists.txt
index b0b7dab982..2b2ff7aee9 100644
--- a/examples/opengl/2dpainting/CMakeLists.txt
+++ b/examples/opengl/2dpainting/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/2dpainting")
@@ -22,10 +22,12 @@ qt_add_executable(2dpainting
widget.cpp widget.h
window.cpp window.h
)
+
set_target_properties(2dpainting PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(2dpainting PUBLIC
Qt::Core
Qt::Gui
diff --git a/examples/opengl/computegles31/CMakeLists.txt b/examples/opengl/computegles31/CMakeLists.txt
index ac2636e09b..eca508f80a 100644
--- a/examples/opengl/computegles31/CMakeLists.txt
+++ b/examples/opengl/computegles31/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/computegles31")
@@ -19,17 +19,18 @@ qt_add_executable(computegles31
glwindow.cpp glwindow.h
main.cpp
)
+
set_target_properties(computegles31 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(computegles31 PUBLIC
Qt::Core
Qt::Gui
Qt::OpenGL
)
-
# Resources:
set(computegles31_resource_files
"Qt-logo-medium.png"
diff --git a/examples/opengl/contextinfo/CMakeLists.txt b/examples/opengl/contextinfo/CMakeLists.txt
index bddd46cd4e..ad11734e0d 100644
--- a/examples/opengl/contextinfo/CMakeLists.txt
+++ b/examples/opengl/contextinfo/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/contextinfo")
@@ -20,10 +20,12 @@ qt_add_executable(contextinfo
renderwindow.cpp renderwindow.h
widget.cpp widget.h
)
+
set_target_properties(contextinfo PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(contextinfo PUBLIC
Qt::Core
Qt::Gui
diff --git a/examples/opengl/cube/CMakeLists.txt b/examples/opengl/cube/CMakeLists.txt
index f901e2d0f5..ec5dfd4d50 100644
--- a/examples/opengl/cube/CMakeLists.txt
+++ b/examples/opengl/cube/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/cube")
@@ -20,10 +20,12 @@ qt_add_executable(cube
main.cpp
mainwidget.cpp mainwidget.h
)
+
set_target_properties(cube PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(cube PUBLIC
Qt::Core
Qt::Gui
@@ -32,7 +34,6 @@ target_link_libraries(cube PUBLIC
Qt::Widgets
)
-
# Resources:
set(shaders_resource_files
"fshader.glsl"
@@ -45,6 +46,7 @@ qt6_add_resources(cube "shaders"
FILES
${shaders_resource_files}
)
+
set(textures_resource_files
"cube.png"
)
diff --git a/examples/opengl/hellogl2/CMakeLists.txt b/examples/opengl/hellogl2/CMakeLists.txt
index 00ae8693b7..8ce9a96560 100644
--- a/examples/opengl/hellogl2/CMakeLists.txt
+++ b/examples/opengl/hellogl2/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/hellogl2")
@@ -22,10 +22,12 @@ qt_add_executable(hellogl2
mainwindow.cpp mainwindow.h
window.cpp window.h
)
+
set_target_properties(hellogl2 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(hellogl2 PUBLIC
Qt::Core
Qt::Gui
diff --git a/examples/opengl/hellogles3/CMakeLists.txt b/examples/opengl/hellogles3/CMakeLists.txt
index cf1f66c6e6..fdf6fa337a 100644
--- a/examples/opengl/hellogles3/CMakeLists.txt
+++ b/examples/opengl/hellogles3/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/hellogles3")
@@ -20,17 +20,18 @@ qt_add_executable(hellogles3
glwindow.cpp glwindow.h
main.cpp
)
+
set_target_properties(hellogles3 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(hellogles3 PUBLIC
Qt::Core
Qt::Gui
Qt::OpenGL
)
-
# Resources:
set(hellogles3_resource_files
"qtlogo.png"
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt
index 80bb291504..3217690de1 100644
--- a/examples/opengl/hellowindow/CMakeLists.txt
+++ b/examples/opengl/hellowindow/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/hellowindow")
@@ -19,10 +19,12 @@ qt_add_executable(hellowindow
hellowindow.cpp hellowindow.h
main.cpp
)
+
set_target_properties(hellowindow PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(hellowindow PUBLIC
Qt::Core
Qt::CorePrivate
diff --git a/examples/opengl/openglwindow/CMakeLists.txt b/examples/opengl/openglwindow/CMakeLists.txt
index a555608c8e..d9717daf00 100644
--- a/examples/opengl/openglwindow/CMakeLists.txt
+++ b/examples/opengl/openglwindow/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/openglwindow")
@@ -19,10 +19,12 @@ qt_add_executable(openglwindow
main.cpp
openglwindow.cpp openglwindow.h
)
+
set_target_properties(openglwindow PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_include_directories(openglwindow PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
diff --git a/examples/opengl/paintedwindow/CMakeLists.txt b/examples/opengl/paintedwindow/CMakeLists.txt
index 632df35e20..a0cfbe0454 100644
--- a/examples/opengl/paintedwindow/CMakeLists.txt
+++ b/examples/opengl/paintedwindow/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/paintedwindow")
@@ -19,10 +19,12 @@ qt_add_executable(paintedwindow
main.cpp
paintedwindow.cpp paintedwindow.h
)
+
set_target_properties(paintedwindow PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(paintedwindow PUBLIC
Qt::Core
Qt::Gui
diff --git a/examples/opengl/qopenglwidget/CMakeLists.txt b/examples/opengl/qopenglwidget/CMakeLists.txt
index 56f985a454..88b04733db 100644
--- a/examples/opengl/qopenglwidget/CMakeLists.txt
+++ b/examples/opengl/qopenglwidget/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/qopenglwidget")
@@ -21,10 +21,12 @@ qt_add_executable(qopenglwidget
main.cpp
mainwindow.cpp mainwindow.h
)
+
set_target_properties(qopenglwidget PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(qopenglwidget PUBLIC
Qt::Core
Qt::Gui
@@ -33,7 +35,6 @@ target_link_libraries(qopenglwidget PUBLIC
Qt::Widgets
)
-
# Resources:
set(texture_resource_files
"qt.png"
diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/examples/opengl/qopenglwindow/CMakeLists.txt
index 1236df6148..f4b01ebbb7 100644
--- a/examples/opengl/qopenglwindow/CMakeLists.txt
+++ b/examples/opengl/qopenglwindow/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/qopenglwindow")
@@ -19,10 +19,12 @@ qt_add_executable(qopenglwindow
background_renderer.cpp background_renderer.h
main.cpp
)
+
set_target_properties(qopenglwindow PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_include_directories(qopenglwindow PUBLIC
.
)
@@ -33,7 +35,6 @@ target_link_libraries(qopenglwindow PUBLIC
Qt::OpenGL
)
-
# Resources:
set(shaders_resource_files
"background.frag"
diff --git a/examples/opengl/textures/CMakeLists.txt b/examples/opengl/textures/CMakeLists.txt
index adf9049df4..7d67a892c7 100644
--- a/examples/opengl/textures/CMakeLists.txt
+++ b/examples/opengl/textures/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/textures")
@@ -20,10 +20,12 @@ qt_add_executable(textures
main.cpp
window.cpp window.h
)
+
set_target_properties(textures PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(textures PUBLIC
Qt::Core
Qt::Gui
@@ -32,7 +34,6 @@ target_link_libraries(textures PUBLIC
Qt::Widgets
)
-
# Resources:
set(textures_resource_files
"images/side1.png"
diff --git a/examples/opengl/threadedqopenglwidget/CMakeLists.txt b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
index 7aea309b45..f6150748b9 100644
--- a/examples/opengl/threadedqopenglwidget/CMakeLists.txt
+++ b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
+ set(INSTALL_EXAMPLESDIR "examples")
endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/threadedqopenglwidget")
@@ -20,10 +20,12 @@ qt_add_executable(threadedqopenglwidget
main.cpp
mainwindow.cpp mainwindow.h
)
+
set_target_properties(threadedqopenglwidget PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(threadedqopenglwidget PUBLIC
Qt::Core
Qt::Gui