From c781bcc2038e4957f24e32d621d072e83d9d3883 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 17 Oct 2015 18:23:55 +0300
Subject: [PATCH] solid: build static library only when tests are to be run

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 solid/solid/CMakeLists.txt | 6 ++++--
 solid/tests/CMakeLists.txt | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt
index 799f0377..1161ca02 100644
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
@@ -332,9 +332,11 @@ install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INT
 
 ########### static lib for tests  ###############
 
-add_library(solid_static STATIC ${solid_LIB_SRCS})
+if(ENABLE_TESTING)
+    add_library(solid_static STATIC ${solid_LIB_SRCS})
 
-target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
+    target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
+endif()
 
 ########### install files ###############
 
diff --git a/solid/tests/CMakeLists.txt b/solid/tests/CMakeLists.txt
index a4e4caad..4e7b5287 100644
--- a/solid/tests/CMakeLists.txt
+++ b/solid/tests/CMakeLists.txt
@@ -1,6 +1,3 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-
 ########### fakehardwaretest ###############
 
 set(fakehardwaretest_SRCS fakehardwaretest.cpp )