From d62e0424f253dfd62fde93232452d8b377197191 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 30 Jun 2021 21:13:59 +0200 Subject: [PATCH] Fix path issues when imported as subdirectory --- CMakeLists.txt | 4 ++-- source/Irrlicht/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9065b04..89f962be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,9 @@ elseif(WIN32) else() set(sysname Linux) endif() -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${sysname}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/${sysname}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${sysname}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/${sysname}) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE) diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt index e53705e7..7492c09e 100644 --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@ -26,7 +26,7 @@ find_package(PNG REQUIRED) # To configure the features available in this Irrlicht build please edit # include/IrrCompileConfig.h and re-run CMake from a clean state include(CheckSymbolExists) -set(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/include) +set(CMAKE_REQUIRED_INCLUDES ${PROJECT_SOURCE_DIR}/include) unset(OGLES1_ENABLED CACHE) unset(OGLES2_ENABLED CACHE) unset(OGL_ENABLED CACHE)