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

remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists

Browse source
This commit is contained in:
Stephen Birarda 2014-08-08 13:22:00 -07:00
parent 9d8818eee5
commit 92b2fe6d68
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -44,13 +44,13 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
# setup for find modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
include(${CUSTOM_MACRO})

2
libraries/fbx/CMakeLists.txt
View file

@ -3,7 +3,7 @@ set(TARGET_NAME fbx)
# use setup_hifi_library macro to setup our project and link appropriate Qt modules
setup_hifi_library()
include_glm("${ROOT_DIR}")
include_glm()
link_hifi_libraries(shared networking octree voxels)