diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-20 14:29:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-20 14:30:01 (GMT) |
| commit | b2d764fea17c13631b7476ebb251f71b6aab33f4 (patch) | |
| tree | a8d5c73c2cc12a4d72db44fc4c409107da8deed8 | |
| parent | e3ece528c8718d67560bcc5bab579e77bbf21cbd (diff) | |
| parent | ae6b25d920325585f0e7f56d23d2b0f8e0b39af8 (diff) | |
| download | CMake-b2d764fea17c13631b7476ebb251f71b6aab33f4.zip CMake-b2d764fea17c13631b7476ebb251f71b6aab33f4.tar.gz CMake-b2d764fea17c13631b7476ebb251f71b6aab33f4.tar.bz2 | |
Merge topic 'FindGLUT-include-dirs'
ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6814
| -rw-r--r-- | Modules/FindGLUT.cmake | 2 | ||||
| -rw-r--r-- | Tests/FindGLUT/Test/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index dd0975d..636f1ea 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -71,6 +71,8 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) pkg_check_modules(GLUT glut) if(GLUT_FOUND) + # In the non-pkg-config code path we only provide GLUT_INCLUDE_DIR. + set(GLUT_INCLUDE_DIR "${GLUT_INCLUDE_DIRS}") _add_glut_target_simple() FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_FOUND) return() diff --git a/Tests/FindGLUT/Test/CMakeLists.txt b/Tests/FindGLUT/Test/CMakeLists.txt index 0f4e536..f6440b2 100644 --- a/Tests/FindGLUT/Test/CMakeLists.txt +++ b/Tests/FindGLUT/Test/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(testglut_tgt GLUT::GLUT) add_test(NAME testglut_tgt COMMAND testglut_tgt) add_executable(testglut_var main.c) -target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIRS}) +target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIR}) target_link_libraries(testglut_var PRIVATE ${GLUT_LIBRARIES}) add_test(NAME testglut_var COMMAND testglut_var) |