diff options
author | h.udo <hudokkow@gmail.com> | 2016-09-08 16:42:58 +0100 |
---|---|---|
committer | h.udo <hudokkow@gmail.com> | 2016-12-21 10:04:18 +0000 |
commit | b0cad85adb045b88347cf8cded6770c7dd349406 (patch) | |
tree | 1a0b452f530dd2aa4e139c8e6de3f18b01a66bf2 /cmake/addons | |
parent | a18701e7b2fe03780f90502d5d51e09cdc3ad718 (diff) |
[cmake] Move to root folder: Update paths
Diffstat (limited to 'cmake/addons')
-rw-r--r-- | cmake/addons/CMakeLists.txt | 10 | ||||
-rw-r--r-- | cmake/addons/depends/CMakeLists.txt | 2 | ||||
-rw-r--r-- | cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cmake/addons/CMakeLists.txt b/cmake/addons/CMakeLists.txt index 96e544bb44..f1e2fce04a 100644 --- a/cmake/addons/CMakeLists.txt +++ b/cmake/addons/CMakeLists.txt @@ -31,7 +31,7 @@ if(APP_ROOT) message(WARNING "APP_ROOT is deprecated. Please use CORE_SOURCE_DIR instead.") endif() if(NOT CORE_SOURCE_DIR) - set(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../..) + set(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../..) else() file(TO_CMAKE_PATH "${CORE_SOURCE_DIR}" CORE_SOURCE_DIR) endif() @@ -52,7 +52,7 @@ endif() get_filename_component(ADDON_DEPENDS_PATH "${ADDON_DEPENDS_PATH}" ABSOLUTE) if(NOT PLATFORM_DIR) - set(PLATFORM_DIR ${CORE_SOURCE_DIR}/project/cmake/platform/${CORE_SYSTEM_NAME}) + set(PLATFORM_DIR ${CORE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}) file(TO_CMAKE_PATH "${PLATFORM_DIR}" PLATFORM_DIR) endif() @@ -155,7 +155,7 @@ if(EXISTS ${PLATFORM_DIR}/defines.txt) endif() # include check_target_platform() function -include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/CheckTargetPlatform.cmake) +include(${CORE_SOURCE_DIR}/cmake/scripts/common/CheckTargetPlatform.cmake) set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) if(NOT WIN32) @@ -171,7 +171,7 @@ endif() ### prepare the build environment for the binary addons # copy the PrepareEnv.cmake script to the depends path so that we can include it -file(COPY ${CORE_SOURCE_DIR}/project/cmake/scripts/common/PrepareEnv.cmake DESTINATION ${APP_LIB_DIR}) +file(COPY ${CORE_SOURCE_DIR}/cmake/scripts/common/PrepareEnv.cmake DESTINATION ${APP_LIB_DIR}) # add the location of PrepareEnv.cmake to CMAKE_MODULE_PATH so that it is found list(APPEND CMAKE_MODULE_PATH ${APP_LIB_DIR}) @@ -371,7 +371,7 @@ foreach(addon ${addons}) set(${id}_DEPENDS_DIR ${SOURCE_DIR}/depends) if(EXISTS ${${id}_DEPENDS_DIR}) - include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/HandleDepends.cmake) + include(${CORE_SOURCE_DIR}/cmake/scripts/common/HandleDepends.cmake) add_addon_depends(${id} ${${id}_DEPENDS_DIR}) if(${id}_DEPS AND NOT "${${id}_DEPS}" STREQUAL "") message(STATUS "${id} DEPENDENCIES: ${${id}_DEPS}") diff --git a/cmake/addons/depends/CMakeLists.txt b/cmake/addons/depends/CMakeLists.txt index 622701de79..831e0ed74c 100644 --- a/cmake/addons/depends/CMakeLists.txt +++ b/cmake/addons/depends/CMakeLists.txt @@ -29,7 +29,7 @@ endif() get_filename_component(BUILD_DIR "${BUILD_DIR}" ABSOLUTE) ## use add_addon_depends to handle the cmake based dependencies -include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/HandleDepends.cmake) +include(${CORE_SOURCE_DIR}/cmake/scripts/common/HandleDepends.cmake) add_addon_depends(depends "${PROJECT_SOURCE_DIR}") ## if there's a platform-specific sub-directory containing a CMakeLists.txt, add it to the build as well diff --git a/cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt b/cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt index 2c2c4b8e3f..bb854053de 100644 --- a/cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt +++ b/cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt @@ -6,7 +6,7 @@ function(generate_mingw32_wrapper cmd) configure_file(${PROJECT_SOURCE_DIR}/mingw32-cmd.bat.in ${MINGW_PATH}/bin/${CMD}.bat @ONLY) endfunction() -get_filename_component(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../../../../../.. REALPATH) +get_filename_component(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../../../../.. REALPATH) set(MSYS_PATH "${CORE_SOURCE_DIR}/project/BuildDependencies/msys64") set(MINGW_PATH "${MSYS_PATH}/mingw32") |