Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more path shortening for build of external projects

Browse source
This commit is contained in:
Stephen Birarda 2015-02-19 14:33:31 -08:00
parent a0a4882ed6
commit a3d370f01f
6 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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)

1
cmake/externals/bullet/CMakeLists.txt vendored
View file

@ -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)

1
cmake/externals/glm/CMakeLists.txt vendored
View file

@ -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=<INSTALL_DIR>
LOG_DOWNLOAD 1
LOG_CONFIGURE 1

1
cmake/externals/gverb/CMakeLists.txt vendored
View file

@ -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=<INSTALL_DIR>
BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1

1
cmake/externals/soxr/CMakeLists.txt vendored
View file

@ -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)

2
cmake/macros/SetupExternalsBinaryDir.cmake
View file

@ -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 ()