From 875c707358b5c289fa70dbcd467a3dcf9c2ab302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 21 Aug 2015 07:40:39 +0200 Subject: [PATCH] NOISSUE fix librainbow some more --- application/CMakeLists.txt | 2 +- depends/rainbow/CMakeLists.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 90bb0c04..99ee7f46 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -107,7 +107,7 @@ elseif(WIN32) endif() # directories to look for dependencies -set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR}) +set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) ################################ FILES ################################ diff --git a/depends/rainbow/CMakeLists.txt b/depends/rainbow/CMakeLists.txt index 74c593ff..6eeb2adc 100644 --- a/depends/rainbow/CMakeLists.txt +++ b/depends/rainbow/CMakeLists.txt @@ -13,9 +13,8 @@ include/rainbow.h src/rainbow.cpp ) -#add_definitions(-DRAINBOW_LIBRARY) -add_definitions(-DRAINBOW_STATIC) +add_definitions(-DRAINBOW_LIBRARY) set(RAINBOW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) -add_library(rainbow STATIC ${RAINBOW_SOURCES}) +add_library(rainbow SHARED ${RAINBOW_SOURCES}) qt5_use_modules(rainbow Core Gui)