From bd961152b112047e395d52507a15969c50224282 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Mon, 28 May 2018 16:20:27 +0200 Subject: [PATCH] find_glfw3: more future proof way of finding glfw3 (#75) --- CMakeLists.txt | 8 +++----- README.md | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e5c647..2d45069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ include_directories(${OpenGL_INCLUDE_DIR}) find_package(GLEW REQUIRED) include_directories(${GLEW_INCLUDE_DIRS}) find_package(PkgConfig REQUIRED) -pkg_search_module(GLFW REQUIRED glfw3) -include_directories(${GLFW_INCLUDE_DIRS}) +find_package(glfw3 REQUIRED) +include_directories(${GLFW3_INCLUDE_DIR}) #----------------------------------------------------------------------------- # BUILD TYPES & FLAGS @@ -114,11 +114,9 @@ target_link_libraries(voidstar m ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} - ${GLFW_STATIC_LIBRARIES} # This needs manual addition of ${GLFW_STATIC_LDFLAGS} + glfw ${EXTRA_LIBS} ) -string(REPLACE ";" " " glfw_static_ldflags "${GLFW_STATIC_LDFLAGS}") -set_property(TARGET voidstar APPEND_STRING PROPERTY LINK_FLAGS "${glfw_static_ldflags}") #----------------------------------------------------------------------------- # PACKAGING diff --git a/README.md b/README.md index d56a79d..0476b0f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ https://github.com/fenollp/voidstar/issues/2 ### Debian ```shell -sudo apt install libglew-dev libglm-dev libglfw3-dev +sudo apt install libglew-dev libglm-dev libglfw3-dev pkg-config ``` ### OSX