Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
main: add wl_output proxy-to-id mapping in wl_output global handler
[staging/windowmanager.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
791e645
..
5d38309
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-11,9
+11,11
@@
find_package(PkgConfig REQUIRED)
pkg_check_modules(WLC wayland-client>=1.11.0 REQUIRED)
pkg_check_modules(WLC wayland-client>=1.11.0 REQUIRED)
-find_program(WLSCAN NAMES wayland-scanner)
-
macro(wlproto var_basename proto_xml_basename)
macro(wlproto var_basename proto_xml_basename)
+ if("${WLSCAN}" STREQUAL "")
+ find_program(WLSCAN NAMES wayland-scanner)
+ endif()
+
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/protocol)
set(proto_dir "${CMAKE_CURRENT_SOURCE_DIR}/protocol")
elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../protocol)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/protocol)
set(proto_dir "${CMAKE_CURRENT_SOURCE_DIR}/protocol")
elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../protocol)
@@
-40,9
+42,14
@@
macro(wlproto var_basename proto_xml_basename)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
endmacro()
include_directories(${CMAKE_CURRENT_BINARY_DIR})
endmacro()
-add_definitions(-D_GNU_SOURCE)
+# Should modernize the following somehow...
+set(ENABLE_DEBUG_OUTPUT OFF CACHE BOOL "Enable debug logging")
+if(ENABLE_DEBUG_OUTPUT)
+ add_definitions(-DDEBUG_OUTPUT)
+else()
+ remove_definitions(-DDEBUG_OUTPUT)
+endif()
-set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-parameter -std=c99 ${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -std=c++14 ${CMAKE_CXX_FLAGS}")
+set(SANITIZER_MODE "none" CACHE STRING "Build using a specific sanitizer (e.g. 'address', 'thread', 'leak', 'undefined'), depends on compiler; default none")
add_subdirectory(src)
add_subdirectory(src)