From e0cce7602b8a22a272a6de83b07b64c2b459c509 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 10 Jan 2017 01:19:58 +0100 Subject: [PATCH] cmake: Fix linking against system GLEW --- CMakeLists.txt | 4 ++-- ext/glew/CMakeLists.txt | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caa84b4c4a..a8dc0e169b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,8 +960,8 @@ if(ANDROID) endif() target_link_libraries(native ${LIBZIP_LIBRARY} ${ZLIB_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB}) -if(TARGET glew) - target_link_libraries(native glew) +if(TARGET Ext::GLEW) + target_link_libraries(native Ext::GLEW) endif() if(ANDROID) diff --git a/ext/glew/CMakeLists.txt b/ext/glew/CMakeLists.txt index b938d1cc07..60b1c69b08 100644 --- a/ext/glew/CMakeLists.txt +++ b/ext/glew/CMakeLists.txt @@ -1,5 +1,9 @@ -#find_package(GLEW) -if(NOT GLEW_FOUND) +find_package(GLEW) +if(GLEW_FOUND) + add_library(system_glew INTERFACE) + add_library(Ext::GLEW ALIAS system_glew) + target_link_libraries(system_glew INTERFACE GLEW::GLEW) +else() find_package(OpenGL REQUIRED) add_library(glew STATIC GL/glew.h @@ -7,6 +11,7 @@ if(NOT GLEW_FOUND) GL/wglew.h glew.c ) + add_library(Ext::GLEW ALIAS glew) target_link_libraries(glew PUBLIC ${OPENGL_LIBRARIES}) target_compile_definitions(glew PUBLIC GLEW_STATIC) target_include_directories(glew PUBLIC . ${OPENGL_INCLUDE_DIR})