From a9d2b03c7c8ea33e34c238e1079c66687a6e1ab0 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 9 Jul 2017 19:26:18 +0200 Subject: [PATCH] fix(build): disable linux specific stuff on windows also fix the output formatting of used libraries --- CMakeLists.txt | 6 +++--- cmake/Dependencies.cmake | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73298b896..6aed8c874 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -460,7 +460,7 @@ endif() add_definitions(-DQT_MESSAGELOGCONTEXT=1) -if (NOT DEFINED ENABLE_STATUSNOTIFIER) +if (NOT DEFINED ENABLE_STATUSNOTIFIER AND UNIX AND NOT APPLE) set(ENABLE_STATUSNOTIFIER True) endif() @@ -488,7 +488,7 @@ if(AVFOUNDATION_FOUND) src/platform/camera/avfoundation.h) endif() -if (NOT DEFINED ENABLE_APPINDICATOR) +if (NOT DEFINED ENABLE_APPINDICATOR AND UNIX AND NOT APPLE) set(ENABLE_APPINDICATOR False) endif() @@ -503,7 +503,7 @@ if(${ENABLE_APPINDICATOR}) endif() endif() -if (NOT DEFINED ENABLE_GTK_SYSTRAY) +if (NOT DEFINED ENABLE_GTK_SYSTRAY AND UNIX AND NOT APPLE) set(ENABLE_GTK_SYSTRAY True) endif() diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index f970aeca5..9ff0579f0 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -74,10 +74,10 @@ function(search_dependency pkg) message(STATUS "${pkg} not found") endif() else() - message(STATUS ${pkg} " LIBRARY_DIRS: " ${${pkg}_LIBRARY_DIRS} ) - message(STATUS ${pkg} " INCLUDE_DIRS: " ${${pkg}_INCLUDE_DIRS} ) - message(STATUS ${pkg} " CFLAGS_OTHER: " ${${pkg}_CFLAGS_OTHER} ) - message(STATUS ${pkg} " LIBRARIES: " ${${pkg}_LIBRARIES} ) + message(STATUS ${pkg} " LIBRARY_DIRS: " "${${pkg}_LIBRARY_DIRS}" ) + message(STATUS ${pkg} " INCLUDE_DIRS: " "${${pkg}_INCLUDE_DIRS}" ) + message(STATUS ${pkg} " CFLAGS_OTHER: " "${${pkg}_CFLAGS_OTHER}" ) + message(STATUS ${pkg} " LIBRARIES: " "${${pkg}_LIBRARIES}" ) link_directories(${${pkg}_LIBRARY_DIRS}) include_directories(${${pkg}_INCLUDE_DIRS})