Merge pull request #756 from robotology/fix/findglut

use YCM 0.13.0
robotology · Jul 5, 2021 · 1f85dfb · 1f85dfb
2 parents 10d6b31 + 45844ce
commit 1f85dfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(ICUB_COMPILE_BINDINGS "Compile optional language bindings"  FALSE)
 
-set(YCM_REQUIRED_VERSION 0.11.0)
+set(YCM_REQUIRED_VERSION 0.13.0)
 set(YARP_REQUIRED_VERSION 3.3.2)
 
 find_package(YCM ${YCM_REQUIRED_VERSION} REQUIRED)

diff --git a/src/tools/iCubGui/src/CMakeLists.txt b/src/tools/iCubGui/src/CMakeLists.txt
@@ -53,8 +53,7 @@ source_group("Generated Files" FILES ${iCubGui_QRC_GEN_SRCS}
                                      ${iCubGui_UI_GEN_SRCS})
 
 
-include_directories(${GLUT_INCLUDE_DIRS}
-                    ${OpenGL_INCLUDE_DIRS}
+include_directories(${OpenGL_INCLUDE_DIRS}
                     ${Qt5_INCLUDE_DIRS})
 
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
@@ -68,7 +67,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${QT_DEFINITIONS}
                                                    _USE_MATH_DEFINES
                                                    GLUT_NO_LIB_PRAGMA)
 
-target_link_libraries(iCubGui ${GLUT_LIBRARIES}
+target_link_libraries(iCubGui GLUT::GLUT
                               ${OpenGL_LIBRARIES}
                               ${YARP_LIBRARIES}
                               skinDynLib)