Skip to content

Commit bf81b9c

Browse files
committed
Configuration, CMake - suppress warning on Linux and link to GLVND
1 parent 720a0e8 commit bf81b9c

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

occt-qopenglwidget/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.2)
1+
cmake_minimum_required (VERSION 3.13)
22

33
project (occt-qopenglwidget-sample)
44

@@ -45,6 +45,9 @@ if (MSVC)
4545
endif()
4646

4747
# Find OpenGL
48+
if (NOT WIN32 AND NOT APPLE)
49+
set (OpenGL_GL_PREFERENCE "GLVND")
50+
endif()
4851
find_package (OpenGL REQUIRED)
4952

5053
# Find Qt

occt-qtquick/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.2)
1+
cmake_minimum_required (VERSION 3.13)
22

33
project (occt-qtquick-sample)
44

@@ -45,6 +45,9 @@ if (MSVC)
4545
endif()
4646

4747
# Find OpenGL
48+
if (NOT WIN32 AND NOT APPLE)
49+
set (OpenGL_GL_PREFERENCE "GLVND")
50+
endif()
4851
find_package (OpenGL REQUIRED)
4952

5053
# Find Qt

occt-qwidget/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.2)
1+
cmake_minimum_required (VERSION 3.13)
22

33
project (occt-qwidget-sample)
44

@@ -45,6 +45,9 @@ if (MSVC)
4545
endif()
4646

4747
# Find OpenGL
48+
if (NOT WIN32 AND NOT APPLE)
49+
set (OpenGL_GL_PREFERENCE "GLVND")
50+
endif()
4851
find_package (OpenGL REQUIRED)
4952

5053
# Find Qt

0 commit comments

Comments
 (0)