From a3d370f01f9e3bdb911efa6e4cb1bdc3d03b9ddd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 19 Feb 2015 14:33:31 -0800 Subject: [PATCH] more path shortening for build of external projects --- CMakeLists.txt | 3 ++- cmake/externals/bullet/CMakeLists.txt | 1 + cmake/externals/glm/CMakeLists.txt | 1 + cmake/externals/gverb/CMakeLists.txt | 1 + cmake/externals/soxr/CMakeLists.txt | 1 + cmake/macros/SetupExternalsBinaryDir.cmake | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e216d304c8..563ece524f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,8 @@ if (ANDROID) endforeach() endif () -set_property(DIRECTORY PROPERTY EP_PREFIX "project") +set(EXTERNAL_PROJECT_PREFIX "project") +set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX}) setup_externals_binary_dir() if (WIN32) diff --git a/cmake/externals/bullet/CMakeLists.txt b/cmake/externals/bullet/CMakeLists.txt index 8738212450..1cf82032bf 100644 --- a/cmake/externals/bullet/CMakeLists.txt +++ b/cmake/externals/bullet/CMakeLists.txt @@ -27,6 +27,7 @@ ExternalProject_Add( LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 + BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build ) ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt index e1874f66e4..a6f74b52fe 100644 --- a/cmake/externals/glm/CMakeLists.txt +++ b/cmake/externals/glm/CMakeLists.txt @@ -5,6 +5,7 @@ ExternalProject_Add( ${EXTERNAL_NAME} URL http://pkgs.fedoraproject.org/repo/pkgs/glm/glm-0.9.5.4.zip/fab76fc982b256b46208e5c750ed456a/glm-0.9.5.4.zip URL_MD5 fab76fc982b256b46208e5c750ed456a + BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= LOG_DOWNLOAD 1 LOG_CONFIGURE 1 diff --git a/cmake/externals/gverb/CMakeLists.txt b/cmake/externals/gverb/CMakeLists.txt index cc7be74c2f..c7791c2424 100644 --- a/cmake/externals/gverb/CMakeLists.txt +++ b/cmake/externals/gverb/CMakeLists.txt @@ -10,6 +10,7 @@ ExternalProject_Add( URL http://hifi-public.s3.amazonaws.com/dependencies/gverb-master.zip URL_MD5 8b16d586390a2102804e46b87820dfc6 CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= + BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 diff --git a/cmake/externals/soxr/CMakeLists.txt b/cmake/externals/soxr/CMakeLists.txt index 03b43074c6..c2f5163f94 100644 --- a/cmake/externals/soxr/CMakeLists.txt +++ b/cmake/externals/soxr/CMakeLists.txt @@ -13,6 +13,7 @@ ExternalProject_Add( LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 + BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build ) ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) diff --git a/cmake/macros/SetupExternalsBinaryDir.cmake b/cmake/macros/SetupExternalsBinaryDir.cmake index 0e59328a23..c066363455 100644 --- a/cmake/macros/SetupExternalsBinaryDir.cmake +++ b/cmake/macros/SetupExternalsBinaryDir.cmake @@ -20,7 +20,7 @@ macro(SETUP_EXTERNALS_BINARY_DIR) set(CMAKE_GENERATOR_FOLDER_NAME "vs12") endif () - set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals") + set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-ext") if (ANDROID) set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/android/${CMAKE_GENERATOR_FOLDER_NAME}") else ()