Skip to content

Commit 727cefd

Browse files
committed
wmderland: rebuild for glog-0.7.1_1
1 parent c495e4c commit 727cefd

2 files changed

Lines changed: 45 additions & 1 deletion

File tree

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- a/src/log.h
2+
+++ b/src/log.h
3+
@@ -6,7 +6,6 @@
4+
5+
// If glog is not installed on the compiling machine,
6+
// then these macros will do nothing.
7+
-#if GLOG_FOUND
8+
#include <glog/logging.h>
9+
#define WM_INIT_LOGGING(executable_name) google::InitGoogleLogging(executable_name)
10+
#define WM_LOG(severity, msg) \
11+
@@ -14,10 +13,6 @@
12+
LOG(severity) << msg; \
13+
google::FlushLogFiles(google::severity); \
14+
} while (0)
15+
-#else
16+
-#define WM_INIT_LOGGING(executable_name)
17+
-#define WM_LOG(severity, msg)
18+
-#endif
19+
20+
21+
#define WM_LOG_WITH_ERRNO(reason, errno) \
22+
--- a/CMakeLists.txt
23+
+++ b/CMakeLists.txt
24+
@@ -18,7 +18,7 @@
25+
endif()
26+
27+
find_package(X11 REQUIRED)
28+
-find_package(glog)
29+
+find_package (glog CONFIG REQUIRED)
30+
31+
# CMake will generate config.h from config.h.in
32+
include_directories("src")
33+
@@ -43,10 +43,6 @@
34+
src/workspace.cc
35+
)
36+
37+
-set(LINK_LIBRARIES X11)
38+
-if (GLOG_FOUND)
39+
- set(LINK_LIBRARIES ${LINK_LIBRARIES} glog)
40+
-endif()
41+
-target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
42+
+target_link_libraries(${PROJECT_NAME} X11 glog::glog)
43+
44+
install(TARGETS ${PROJECT_NAME} DESTINATION bin)

srcpkgs/wmderland/template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'wmderland'
22
pkgname=wmderland
33
version=1.0.5
4-
revision=1
4+
revision=2
55
build_style=cmake
66
makedepends="libX11-devel glog-devel"
77
short_desc="Tiling window manager"

0 commit comments

Comments
 (0)