From f70b2ceb7645a5d0afa0c3d2aa261d10b57d97c7 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 22 May 2013 11:23:55 -0700 Subject: [PATCH] Reverted change that would have added glm to shared library. --- libraries/shared/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index 8026aa01de..23f198f730 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,8 +1,5 @@ cmake_minimum_required(VERSION 2.8) -set(ROOT_DIR ../..) -set(MACRO_DIR ${ROOT_DIR}/cmake/macros) - set(TARGET_NAME shared) project(${TARGET_NAME}) @@ -15,9 +12,6 @@ set(HIFI_SHARED_LIBRARY ${TARGET_NAME}) set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) -include(${MACRO_DIR}/IncludeGLM.cmake) -include_glm(${TARGET_NAME} ${ROOT_DIR}) - if (WIN32) # include headers for external libraries and InterfaceConfig. include_directories(${EXTERNAL_ROOT_DIR}) @@ -32,3 +26,4 @@ if (UNIX AND NOT APPLE) find_package(Threads REQUIRED) target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) endif (UNIX AND NOT APPLE) +