StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(build): disable linux specific stuff on windows

Browse Source 
also fix the output formatting of used libraries
This commit is contained in:
sudden6 2017-07-09 19:26:18 +02:00
parent 7849186699
commit a9d2b03c7c
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -460,7 +460,7 @@ endif()
add_definitions(-DQT_MESSAGELOGCONTEXT=1) add_definitions(-DQT_MESSAGELOGCONTEXT=1)
if (NOT DEFINED ENABLE_STATUSNOTIFIER) if (NOT DEFINED ENABLE_STATUSNOTIFIER AND UNIX AND NOT APPLE)
set(ENABLE_STATUSNOTIFIER True) set(ENABLE_STATUSNOTIFIER True)
endif() endif()
@ -488,7 +488,7 @@ if(AVFOUNDATION_FOUND)
src/platform/camera/avfoundation.h) src/platform/camera/avfoundation.h)
endif() endif()
if (NOT DEFINED ENABLE_APPINDICATOR) if (NOT DEFINED ENABLE_APPINDICATOR AND UNIX AND NOT APPLE)
set(ENABLE_APPINDICATOR False) set(ENABLE_APPINDICATOR False)
endif() endif()
@ -503,7 +503,7 @@ if(${ENABLE_APPINDICATOR})
endif() endif()
endif() endif()
if (NOT DEFINED ENABLE_GTK_SYSTRAY) if (NOT DEFINED ENABLE_GTK_SYSTRAY AND UNIX AND NOT APPLE)
set(ENABLE_GTK_SYSTRAY True) set(ENABLE_GTK_SYSTRAY True)
endif() endif()

8
cmake/Dependencies.cmake
View File

@ -74,10 +74,10 @@ function(search_dependency pkg)
message(STATUS "${pkg} not found") message(STATUS "${pkg} not found")
endif() endif()
else() else()
message(STATUS ${pkg} " LIBRARY_DIRS: " ${${pkg}_LIBRARY_DIRS} ) message(STATUS ${pkg} " LIBRARY_DIRS: " "${${pkg}_LIBRARY_DIRS}" )
message(STATUS ${pkg} " INCLUDE_DIRS: " ${${pkg}_INCLUDE_DIRS} ) message(STATUS ${pkg} " INCLUDE_DIRS: " "${${pkg}_INCLUDE_DIRS}" )
message(STATUS ${pkg} " CFLAGS_OTHER: " ${${pkg}_CFLAGS_OTHER} ) message(STATUS ${pkg} " CFLAGS_OTHER: " "${${pkg}_CFLAGS_OTHER}" )
message(STATUS ${pkg} " LIBRARIES: " ${${pkg}_LIBRARIES} ) message(STATUS ${pkg} " LIBRARIES: " "${${pkg}_LIBRARIES}" )
link_directories(${${pkg}_LIBRARY_DIRS}) link_directories(${${pkg}_LIBRARY_DIRS})
include_directories(${${pkg}_INCLUDE_DIRS}) include_directories(${${pkg}_INCLUDE_DIRS})