From 65e72715c08d19ee51595905b04981124e72f9cb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 5 Aug 2018 23:59:51 +0200 Subject: [PATCH 1/3] Fix GLFW3 library lookup under Linux The original problem report can be seen at: https://eu07.pl/forum/index.php/topic,30260.html#msg487096 --- CMake_modules/FindGLFW3.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake_modules/FindGLFW3.cmake b/CMake_modules/FindGLFW3.cmake index a92f95a8..da0525c5 100644 --- a/CMake_modules/FindGLFW3.cmake +++ b/CMake_modules/FindGLFW3.cmake @@ -48,7 +48,7 @@ ELSEIF(MSVC) ENDIF() FIND_LIBRARY(GLFW3_LIBRARIES - NAMES glfw3dll glfw3 + NAMES glfw3dll glfw3 glfw PATHS "${DEPENDS_DIR}/glfw" "$ENV{ProgramW6432}/glfw" From 883d02975850cbe139945b052f2217f2ac70cff0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 6 Aug 2018 00:03:26 +0200 Subject: [PATCH 2/3] Add support for building with luajit-2.1 --- CMake_modules/FindLuaJIT.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake_modules/FindLuaJIT.cmake b/CMake_modules/FindLuaJIT.cmake index b9bdcdbf..72a8a4c9 100644 --- a/CMake_modules/FindLuaJIT.cmake +++ b/CMake_modules/FindLuaJIT.cmake @@ -28,7 +28,7 @@ find_path(LUAJIT_INCLUDE_DIR luajit.h HINTS $ENV{LUA_DIR} - PATH_SUFFIXES include/luajit-2.0 include + PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include PATHS ~/Library/Frameworks /Library/Frameworks From 9955bb04264b3580d7558993965fb0ee387cf1a4 Mon Sep 17 00:00:00 2001 From: milek7 Date: Wed, 11 Jul 2018 19:25:04 +0200 Subject: [PATCH 3/3] Apply CMake policy CMP0072 only when available CMP0072 policy introduced in commit e5d60cb requires CMake >= 3.11 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad2d3a51..b1c09c54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,7 +152,10 @@ set_target_properties( ${PROJECT_NAME} DEBUG_POSTFIX "_d" ) -cmake_policy(SET CMP0072 NEW) +if (POLICY CMP0072) + cmake_policy(SET CMP0072 NEW) +endif() + find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES})