eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'master' of https://github.com/eu07/maszyna

Browse Source
This commit is contained in:
milek7
2018-08-13 20:10:38 +02:00
parent 4718e62ade 39da22305b
commit 2c49f57809
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -152,7 +152,10 @@ set_target_properties( ${PROJECT_NAME}
DEBUG_POSTFIX "_d" DEBUG_POSTFIX "_d"
) )
cmake_policy(SET CMP0072 NEW) if (POLICY CMP0072)
cmake_policy(SET CMP0072 NEW)
endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES})

2
CMake_modules/FindGLFW3.cmake
View File

@@ -48,7 +48,7 @@ ELSEIF(MSVC)
ENDIF() ENDIF()
FIND_LIBRARY(GLFW3_LIBRARIES FIND_LIBRARY(GLFW3_LIBRARIES
NAMES glfw3dll glfw3 NAMES glfw3dll glfw3 glfw
PATHS PATHS
"${DEPENDS_DIR}/glfw" "${DEPENDS_DIR}/glfw"
"$ENV{ProgramW6432}/glfw" "$ENV{ProgramW6432}/glfw"

2
CMake_modules/FindLuaJIT.cmake
View File

@@ -28,7 +28,7 @@
find_path(LUAJIT_INCLUDE_DIR luajit.h find_path(LUAJIT_INCLUDE_DIR luajit.h
HINTS HINTS
$ENV{LUA_DIR} $ENV{LUA_DIR}
PATH_SUFFIXES include/luajit-2.0 include PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks