From 447ca6a2ffb325335ef532306ade5295200da1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 4 Dec 2015 20:47:57 +0100 Subject: [PATCH] CMake subproject support, part 1: use project-relative paths. Otherwise it would reference directory relative to source root and not project root, which is not always the same. --- CMakeLists.txt | 2 +- doc/generated/CMakeLists.txt | 2 +- doc/getting-started.dox | 2 +- src/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8cdcd41d..92bc57ac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 2.8.9) project(Magnum) # Find Corrade first so we can check on the target -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/modules/") find_package(Corrade REQUIRED) include(CMakeDependentOption) diff --git a/doc/generated/CMakeLists.txt b/doc/generated/CMakeLists.txt index 1da6f273f..a093f58c6 100644 --- a/doc/generated/CMakeLists.txt +++ b/doc/generated/CMakeLists.txt @@ -26,7 +26,7 @@ cmake_minimum_required(VERSION 2.8.9) project(MyApplication) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../../modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/../../modules/") find_package(Magnum REQUIRED MeshTools diff --git a/doc/getting-started.dox b/doc/getting-started.dox index 3429e7df3..efb0a01df 100644 --- a/doc/getting-started.dox +++ b/doc/getting-started.dox @@ -86,7 +86,7 @@ subdirectory. cmake_minimum_required(VERSION 2.8.9) project(MyApplication) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/modules/") add_subdirectory(src) @endcode diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0a5df43d5..74c317338 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,7 +47,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CO # 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) # where only our headers will be used -include_directories(${CMAKE_SOURCE_DIR}/src/MagnumExternal/OpenGL) +include_directories(${PROJECT_SOURCE_DIR}/src/MagnumExternal/OpenGL) add_subdirectory(MagnumExternal) add_subdirectory(Magnum)