Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix(build): disable linux specific stuff on windows
Browse files Browse the repository at this point in the history
also fix the output formatting of used libraries
  • Loading branch information
sudden6 committed Jul 16, 2017
1 parent 7849186 commit a9d2b03
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand All @@ -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()

Expand Down
8 changes: 4 additions & 4 deletions cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit a9d2b03

Please sign in to comment.