From cc2f35ca8929fad3e10a969aaa6a83fa832504ad Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 12 Apr 2013 15:59:16 -0700 Subject: [PATCH] pass a ROOT_DIR to LinkHifiLibrary --- audio-mixer/CMakeLists.txt | 6 ++++-- avatar-mixer/CMakeLists.txt | 9 ++++++--- cmake/macros/LinkHifiLibrary.cmake | 10 +++++----- domain-server/CMakeLists.txt | 6 ++++-- injector/CMakeLists.txt | 14 +++++++------- interface/CMakeLists.txt | 8 +++++--- libraries/voxels/CMakeLists.txt | 8 ++++++-- space-server/CMakeLists.txt | 6 ++++-- voxel-server/CMakeLists.txt | 8 +++++--- 9 files changed, 46 insertions(+), 29 deletions(-) diff --git a/audio-mixer/CMakeLists.txt b/audio-mixer/CMakeLists.txt index cbb5075232..0eb0dab782 100644 --- a/audio-mixer/CMakeLists.txt +++ b/audio-mixer/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 2.8) -set(MACRO_DIR ../cmake/macros) + +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) set(TARGET_NAME audio-mixer) @@ -8,7 +10,7 @@ setup_hifi_project(${TARGET_NAME}) # link the shared hifi library include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link the threads library find_package(Threads REQUIRED) diff --git a/avatar-mixer/CMakeLists.txt b/avatar-mixer/CMakeLists.txt index 34a58879f6..c3251fe513 100644 --- a/avatar-mixer/CMakeLists.txt +++ b/avatar-mixer/CMakeLists.txt @@ -2,13 +2,16 @@ cmake_minimum_required(VERSION 2.8) set(TARGET_NAME "avatar-mixer") +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) + # setup the project -include(../cmake/macros/SetupHifiProject.cmake) +include(${MACRO_DIR}/SetupHifiProject.cmake) setup_hifi_project(${TARGET_NAME}) # link the shared hifi library -include(../cmake/macros/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link the threads library find_package(Threads REQUIRED) diff --git a/cmake/macros/LinkHifiLibrary.cmake b/cmake/macros/LinkHifiLibrary.cmake index 3239afbf83..6aaf784437 100644 --- a/cmake/macros/LinkHifiLibrary.cmake +++ b/cmake/macros/LinkHifiLibrary.cmake @@ -1,15 +1,15 @@ -MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET) +MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET ROOT_DIR) if (NOT TARGET ${LIBRARY}) - add_subdirectory(../libraries/${LIBRARY} ../libraries/${LIBRARY}) + add_subdirectory(${ROOT_DIR}/libraries/${LIBRARY} ${ROOT_DIR}/libraries/${LIBRARY}) endif (NOT TARGET ${LIBRARY}) string(TOUPPER ${LIBRARY} UPPERCASED_LIBRARY_NAME) set(HIFI_LIBRARY_PROPERTY "HIFI_${UPPERCASED_LIBRARY_NAME}_LIBRARY") get_directory_property(HIFI_LIBRARY - DIRECTORY ../libraries/${LIBRARY} + DIRECTORY ${ROOT_DIR}/libraries/${LIBRARY} DEFINITION ${HIFI_LIBRARY_PROPERTY}) - include_directories(../libraries/${LIBRARY}/src) + include_directories(${ROOT_DIR}/libraries/${LIBRARY}/src) add_dependencies(${TARGET} ${LIBRARY}) target_link_libraries(${TARGET} ${LIBRARY}) @@ -19,4 +19,4 @@ MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET) # link in required OS X framework set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreServices") endif (APPLE) -ENDMACRO(LINK_HIFI_LIBRARY _library _target) \ No newline at end of file +ENDMACRO(LINK_HIFI_LIBRARY _library _target _root_dir) \ No newline at end of file diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index 6642fc090a..2752e514ad 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 2.8) -set(MACRO_DIR ../cmake/macros) + +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) set(TARGET_NAME domain-server) @@ -8,4 +10,4 @@ setup_hifi_project(${TARGET_NAME}) # link the shared hifi library include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) \ No newline at end of file +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) \ No newline at end of file diff --git a/injector/CMakeLists.txt b/injector/CMakeLists.txt index ee106b3fc0..d8a448b7bc 100644 --- a/injector/CMakeLists.txt +++ b/injector/CMakeLists.txt @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 2.8) -project(injector) +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) -# grab the implemenation and header files -file(GLOB INJECTOR_SRCS src/*.cpp src/*.h) +set(TARGET_NAME injector) -# add the executable -add_executable(injector ${INJECTOR_SRCS}) +include(${MACRO_DIR}/SetupHifiProject.cmake) +setup_hifi_project(${TARGET_NAME}) # link the shared hifi library -include(../cmake/macros/LinkHifiLibrary.cmake) -link_hifi_library(shared injector) +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link the threads library find_package(Threads REQUIRED) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index c16ab3c939..257e88a571 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 2.8) +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) + set(TARGET_NAME interface) project(${TARGET_NAME}) @@ -22,7 +25,6 @@ if (WIN32) endif (WIN32) # set up the external glm library -set(MACRO_DIR ../cmake/macros) include(${MACRO_DIR}/IncludeGLM.cmake) include_glm(${TARGET_NAME} ${MACRO_DIR}) @@ -54,10 +56,10 @@ add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS}) # link in the hifi shared library include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link in the hifi voxels library -link_hifi_library(voxels ${TARGET_NAME}) +link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR}) # find required libraries find_package(GLM REQUIRED) diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt index 376d652d00..21188c26f9 100644 --- a/libraries/voxels/CMakeLists.txt +++ b/libraries/voxels/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.8) -set(MACRO_DIR ../../cmake/macros) +set(ROOT_DIR ../../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) # setup for find modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/") @@ -18,5 +19,8 @@ file(GLOB HIFI_VOXELS_SRCS src/*.h src/*.cpp) # create a library and set the property so it can be referenced later add_library(${TARGET_NAME} ${HIFI_VOXELS_SRCS}) -include_directories(${TARGET_NAME} ../shared/src) + +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) + set(HIFI_VOXELS_LIBRARY ${TARGET_NAME}) \ No newline at end of file diff --git a/space-server/CMakeLists.txt b/space-server/CMakeLists.txt index c7ee39ef22..4e5c698254 100644 --- a/space-server/CMakeLists.txt +++ b/space-server/CMakeLists.txt @@ -1,11 +1,13 @@ cmake_minimum_required(VERSION 2.8) +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) + set(TARGET_NAME space-server) -set(MACRO_DIR ../cmake/macros) include(${MACRO_DIR}/SetupHifiProject.cmake) setup_hifi_project(${TARGET_NAME}) include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) \ No newline at end of file +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) \ No newline at end of file diff --git a/voxel-server/CMakeLists.txt b/voxel-server/CMakeLists.txt index eaac46fc9f..56b728c186 100644 --- a/voxel-server/CMakeLists.txt +++ b/voxel-server/CMakeLists.txt @@ -2,14 +2,16 @@ cmake_minimum_required(VERSION 2.8) set(TARGET_NAME voxel-server) -set(MACRO_DIR ../cmake/macros) +set(ROOT_DIR ../) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) + include(${MACRO_DIR}/SetupHifiProject.cmake) setup_hifi_project(${TARGET_NAME}) # link in the shared library include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME}) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link in the hifi voxels library -link_hifi_library(voxels ${TARGET_NAME}) \ No newline at end of file +link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR}) \ No newline at end of file