Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-08 23:19:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted change that would have added glm to shared library.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-05-22 11:23:55 -07:00
parent ada32f1a8b
commit f70b2ceb76
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/shared/CMakeLists.txt
View file

@ -1,8 +1,5 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(ROOT_DIR ../..)
set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
set(TARGET_NAME shared) set(TARGET_NAME shared)
project(${TARGET_NAME}) project(${TARGET_NAME})
@ -15,9 +12,6 @@ set(HIFI_SHARED_LIBRARY ${TARGET_NAME})
set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} ${ROOT_DIR})
if (WIN32) if (WIN32)
# include headers for external libraries and InterfaceConfig. # include headers for external libraries and InterfaceConfig.
include_directories(${EXTERNAL_ROOT_DIR}) include_directories(${EXTERNAL_ROOT_DIR})
@ -32,3 +26,4 @@ if (UNIX AND NOT APPLE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)