Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:37:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shorten externals binary dir path

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

14
CMakeLists.txt
View file

@ -110,17 +110,6 @@ set(HIFI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros") set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros")
set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals") set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals")
STRING(REGEX REPLACE " " "-" CMAKE_GENERATOR_FOLDER_NAME ${CMAKE_GENERATOR})
set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals")
if (ANDROID)
set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/android/${CMAKE_GENERATOR_FOLDER_NAME}")
else ()
set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/${CMAKE_GENERATOR_FOLDER_NAME}")
endif ()
set_property(DIRECTORY PROPERTY EP_PREFIX "project")
file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake") file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS}) foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
include(${CUSTOM_MACRO}) include(${CUSTOM_MACRO})
@ -133,6 +122,9 @@ if (ANDROID)
endforeach() endforeach()
endif () endif ()
set_property(DIRECTORY PROPERTY EP_PREFIX "project")
setup_externals_binary_dir()
if (WIN32) if (WIN32)
add_paths_to_lib_paths("${QT_DIR}/bin") add_paths_to_lib_paths("${QT_DIR}/bin")
endif () endif ()

30
cmake/macros/SetupExternalsBinaryDir.cmake Normal file
View file

@ -0,0 +1,30 @@
#
# SetupExternalsBinaryDir.cmake
# cmake/macros
#
# Copyright 2015 High Fidelity, Inc.
# Created by Stephen Birarda on February 19, 2014
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
macro(SETUP_EXTERNALS_BINARY_DIR)
# get a short name for the generator to use in the path
STRING(REGEX REPLACE " " "-" CMAKE_GENERATOR_FOLDER_NAME ${CMAKE_GENERATOR})
if (CMAKE_GENERATOR_FOLDER_NAME STREQUAL "Unix-Makefiles")
set(CMAKE_GENERATOR_FOLDER_NAME "makefiles")
elseif (CMAKE_GENERATOR_FOLDER_NAME STREQUAL "Visual-Studio-12")
set(CMAKE_GENERATOR_FOLDER_NAME "vs12")
endif ()
set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals")
if (ANDROID)
set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/android/${CMAKE_GENERATOR_FOLDER_NAME}")
else ()
set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/${CMAKE_GENERATOR_FOLDER_NAME}")
endif ()
endmacro()