From e66c1ca552a840b8980db37eb978ffabd45ed990 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 16 Jul 2013 13:01:46 -0700 Subject: [PATCH] link Qt to the shared library --- libraries/shared/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index 23f198f730..cf1c603b7d 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,14 +1,13 @@ cmake_minimum_required(VERSION 2.8) +set(ROOT_DIR ../..) +set(MACRO_DIR ${ROOT_DIR}/cmake/macros) + set(TARGET_NAME shared) project(${TARGET_NAME}) -# grab the implemenation and header files -file(GLOB HIFI_SHARED_SRCS src/*.h src/*.cpp) - -# create a library and set the property so it can be referenced later -add_library(${TARGET_NAME} ${HIFI_SHARED_SRCS}) -set(HIFI_SHARED_LIBRARY ${TARGET_NAME}) +include(${MACRO_DIR}/SetupHifiLibrary.cmake) +setup_hifi_library(${TARGET_NAME}) set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)