summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-07-08 19:46:45 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-07-09 00:36:07 +0200
commitca22775edeb78e186a3ded45d004316748f084eb (patch)
tree8278c4a003ae8e2d1f6a89c1d2b76d3f0eced30e
parent5275ed4e9f6988b70330ec1feb9854ff919d52b0 (diff)
downloadtdegraphics-r14.0.x.tar.gz
tdegraphics-r14.0.x.zip
Use FindOpenGL instead of pkg_search_module( GLU ).r14.0.x
This resolves FTBFS on FreeBSD 13. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 866f96c1f45c0d8302267c3bc3b286369cf9dcfe)
-rw-r--r--kpovmodeler/CMakeLists.txt4
-rw-r--r--kpovmodeler/ConfigureChecks.cmake9
2 files changed, 7 insertions, 6 deletions
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index 6ec98ae4..b589117f 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
- ${GLU_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
)
@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
pmpartiface.skel
VERSION 0.0.0
- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
index f4fdd1c0..a55045d4 100644
--- a/kpovmodeler/ConfigureChecks.cmake
+++ b/kpovmodeler/ConfigureChecks.cmake
@@ -10,13 +10,14 @@
#################################################
# glu
-pkg_search_module( GLU glu )
-if( NOT GLU_FOUND )
+set( OpenGL_GL_PREFERENCE LEGACY )
+find_package( OpenGL )
+if( NOT OPENGL_FOUND )
check_include_file ( GL/glu.h HAVE_GLU )
if( NOT HAVE_GLU )
- tde_message_fatal( "glu is required, but was not found on your system" )
+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
endif ( )
- set( GLU_LIBRARIES "-lGL -lGLU" )
+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
endif( )