Browse Source

CMake: use CORRADE_INCLUDE_DIRS instead of CORRADE_INCLUDE_DIR.

pull/126/head
Vladimír Vondruš 11 years ago
parent
commit
986099a5d3
  1. 2
      modules/FindMagnum.cmake
  2. 2
      src/CMakeLists.txt

2
modules/FindMagnum.cmake

@ -209,7 +209,7 @@ endforeach()
# Dependent libraries and includes
set(MAGNUM_INCLUDE_DIRS ${MAGNUM_INCLUDE_DIR}
${MAGNUM_INCLUDE_DIR}/MagnumExternal/OpenGL
${CORRADE_INCLUDE_DIR})
${CORRADE_INCLUDE_DIRS})
set(MAGNUM_LIBRARIES ${MAGNUM_LIBRARY}
${CORRADE_UTILITY_LIBRARIES}
${CORRADE_PLUGINMANAGER_LIBRARIES})

2
src/CMakeLists.txt

@ -42,7 +42,7 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CORRADE_CXX_FLAGS}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CORRADE_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CORRADE_INCLUDE_DIRS})
# We can use both implicit include path (GLES2/gl2.h) where our headers can
# be overriden with system ones or explicit (MagnumExternal/OpenGL/GLES2/gl2ext.h)

Loading…
Cancel
Save