From 233ce67379e0105a68ac1f9dcd6dab5652e45f20 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 6 Jun 2013 11:57:38 -0700
Subject: [PATCH] don't link STK library while not being used
---
audio-mixer/CMakeLists.txt | 8 +-------
audio-mixer/src/main.cpp | 2 --
injector/CMakeLists.txt | 8 +-------
interface/CMakeLists.txt | 6 ------
libraries/audio/CMakeLists.txt | 8 +-------
5 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/audio-mixer/CMakeLists.txt b/audio-mixer/CMakeLists.txt
index 7e83e6fc1a..eac2792883 100644
--- a/audio-mixer/CMakeLists.txt
+++ b/audio-mixer/CMakeLists.txt
@@ -18,10 +18,4 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
# link the shared hifi library
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
-
-# link the stk library
-set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
-find_package(STK REQUIRED)
-target_link_libraries(${TARGET_NAME} ${STK_LIBRARIES})
-include_directories(${STK_INCLUDE_DIRS})
\ No newline at end of file
+link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
\ No newline at end of file
diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index cbe64706cd..7276a24594 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -24,8 +24,6 @@
#include <AgentTypes.h>
#include <SharedUtil.h>
#include <StdDev.h>
-#include <Stk.h>
-#include <FreeVerb.h>
#include "InjectedAudioRingBuffer.h"
#include "AvatarAudioRingBuffer.h"
diff --git a/injector/CMakeLists.txt b/injector/CMakeLists.txt
index 83a650c62e..2c022b0e92 100644
--- a/injector/CMakeLists.txt
+++ b/injector/CMakeLists.txt
@@ -19,10 +19,4 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
-
-# link the stk library
-set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
-find_package(STK REQUIRED)
-target_link_libraries(${TARGET_NAME} ${STK_LIBRARIES})
-include_directories(${STK_INCLUDE_DIRS})
\ No newline at end of file
+link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 5b0f94d7db..b2984b35bb 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -146,12 +146,6 @@ else (WIN32)
include_directories(${PORTAUDIO_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${PORTAUDIO_LIBRARIES})
- # link the stk library
- set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
- find_package(STK REQUIRED)
- target_link_libraries(${TARGET_NAME} ${STK_LIBRARIES})
- include_directories(${STK_INCLUDE_DIRS})
-
# link required libraries on UNIX
if (UNIX AND NOT APPLE)
find_package(Threads REQUIRED)
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index 229f3dd49f..686986340f 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -19,10 +19,4 @@ link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
# link the threads library
find_package(Threads REQUIRED)
-target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
-
-# link the stk library
-set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
-find_package(STK REQUIRED)
-target_link_libraries(${TARGET_NAME} ${STK_LIBRARIES})
-include_directories(${STK_INCLUDE_DIRS})
\ No newline at end of file
+target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
\ No newline at end of file