Commit Graph

66 Commits

Author SHA1 Message Date
Yacine Hmito 284720cf5f Added include(GNUInstallDirs)
Fixes configuration not properly installed since f02cf75
2015-12-23 16:40:28 +01:00
Yacine Hmito f02cf75ff3 Use SYSCONFDIR as recommended
- swaylock config path not hardcoded anymore
- the unusual and weird FALLBACK_CONFIG_DIR is no more
2015-12-23 12:22:48 +01:00
robotanarchy 470e59b291 fix backtrace detection in CMake
works on arch (glibc) and void linux (tested with musl libc) now
2015-12-22 00:32:41 +01:00
robotanarchy 03c041dd30 add -fPIC flag (position independent code) like in wlc
Linking fails otherwise:

Linking C executable ../bin/sway
/usr/bin/ld: CMakeFiles/sway.dir/commands.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a shared object; recompile with -fPIC
CMakeFiles/sway.dir/commands.c.o: error adding symbols: Bad value
collect2: error: ld returned 1 exit status
sway/CMakeFiles/sway.dir/build.make:442: recipe for target 'bin/sway' failed
2015-12-21 19:10:49 +01:00
robotanarchy 94cac7a014 use CMake's FindBacktrace for backtrace feature detection 2015-12-21 19:01:17 +01:00
progandy 21014e606b make gdk-pixbuf dependency really optional 2015-12-20 17:37:52 +01:00
Drew DeVault 05e48835f7 Make some dependencies optional
Closes #368
2015-12-20 09:14:30 -05:00
Drew DeVault f62502e78d Drop sway-xorg.desktop 2015-12-18 18:21:55 -05:00
Drew DeVault 9c141f0bf1 Implement PAM password verification in swaylock 2015-12-17 08:44:30 -05:00
Drew DeVault f80481a37d Add swaylock subproject 2015-12-10 07:52:24 -05:00
Drew DeVault 7ed204eb02 Merge pull request #296 from progandy/pixbuf
Support for more image formats for wallpapers with gdk-pixbuf (#282)
2015-12-08 07:09:21 -05:00
progandy 3fdf4f811f swaybg: load more image formats with gdk-pixbuf2
travis: added gdk-pixbuf2 dependency
2015-12-07 23:31:44 +01:00
Christoph Gysin 99af7e7c9c move manpages to subfolders 2015-12-02 12:49:01 +02:00
Christoph Gysin cce9c338c0 cmake: build common code only once
This creates (static) libraries for protocols/, common/, and wayland/.
2015-12-02 12:15:57 +02:00
Christoph Gysin 38d4ee9f50 cmake: remove extra space 2015-12-01 22:47:22 +02:00
Christoph Gysin 92a3538381 cmake: extract sway 2015-12-01 22:47:22 +02:00
Christoph Gysin 4277070a7b cmake: extract add_manpage() 2015-12-01 22:47:22 +02:00
Christoph Gysin 55b3532fe0 cmake: remove unnecessary quotes 2015-12-01 22:03:53 +02:00
Christoph Gysin 8f00eac07b cmake: remove old-style endif condition 2015-12-01 22:03:09 +02:00
Christoph Gysin 2dedf206d7 cmake: use out-of-source build 2015-12-01 22:03:09 +02:00
Christoph Gysin a043c9030c cmake: separate C flags and preprocesser definitions 2015-12-01 22:03:09 +02:00
Christoph Gysin f7ec3d00a0 cmake: use tabs instead of spaces 2015-12-01 22:03:09 +02:00
Christoph Gysin 905966bcae cmake: style consistency 2015-12-01 22:03:09 +02:00
Christoph Gysin 2429266e3e cmake: convert all cmake commands to lowercase 2015-12-01 22:03:09 +02:00
Yacine Hmito f3f77f9ff1 FALLBACK_CONFIG_DIR did not work. Fixed.
- Flag was ignored. Now it's taken into account.
- Missing trailing slashes in path now behaves properly.
2015-12-01 19:41:44 +01:00
Yacine Hmito 09feef89ee Can customize config fallback directory
CMake takes a `FALLBACK_CONFIG_DIR` flag which is the directory where the
standard configuration file `config` is copied at installation.
If loading from typical configuration directories fails, sway loads
FALLBACK_CONFIG_DIR/config (/etc/sway/config by default).
2015-12-01 01:07:48 +01:00
Drew DeVault 63cf8e48c4 Add swaybar subproject 2015-11-29 10:26:50 -05:00
Drew DeVault 59e97c2788 Add swaygrab(1) man page 2015-11-27 10:06:24 -05:00
Drew DeVault 7c04cd4fc8 Add swaygrab subproject 2015-11-27 09:53:50 -05:00
Drew DeVault 4e7dccf631 Add swaymsg(1) man page 2015-11-26 15:14:23 -05:00
Drew DeVault d69cbeabc0 Add swaymsg subproject 2015-11-26 12:41:24 -05:00
Drew DeVault 82db2a57a9 Basic support for extensions in server and clients 2015-11-18 22:01:22 -05:00
Drew DeVault 5c3f40111a Fix man page installs 2015-11-13 07:56:06 -05:00
Drew DeVault fd1a59def3 Clean up CMake stuff 2015-11-13 07:17:48 -05:00
Ben Boeckel 8e8bdbcae2 cmake: run git in the source directory 2015-11-12 21:56:14 -05:00
Ben Boeckel ec013d1f1a common: create a static library 2015-11-12 21:56:14 -05:00
Ben Boeckel 98678dea5d cmake: clean up installation rules 2015-11-12 21:56:14 -05:00
Ben Boeckel f8ae8cb820 cmake: clean up definition settings 2015-11-12 21:56:14 -05:00
Ben Boeckel 28f1e9842c cmake: manipulate CMAKE_MODULE_PATH as a list
Also prefer local modules.
2015-11-12 21:56:14 -05:00
Ben Boeckel 2e9183e4de cmake: set the output directory once 2015-11-12 21:56:14 -05:00
Ben Boeckel 4714262c3d cmake: simplify manpage generation 2015-11-12 21:56:14 -05:00
Ben Boeckel c8599dba02 cmake: use string(TIMESTAMP) 2015-11-12 21:56:14 -05:00
Ben Boeckel f002baed7a cmake: bump requirement to 3.1.0
CMAKE_C_STANDARD was introduced in 3.1.0.
2015-11-12 21:43:21 -05:00
Drew DeVault bfcabe48ef Start fleshing out wayland client implementation
This introduces a basic shared framework for making wayland clients
within sway itself.
2015-11-12 19:04:01 -05:00
Drew DeVault 4dc913c95e Add swaybg executable
This will let users set their background to something other than that
cringy demoscene thing wlc has now. It's also going to be the first
wayland client written for sway, so I picked an easy thing to work on.
We'll have to figure out how to indicate that it's a special view.
2015-11-12 08:31:47 -05:00
Drew DeVault aadcba4b7c Add new dependencies for wayland clients
Cairo for rendering shit, Pango for text rendering, and wayland client
stuff. Thanks @Cloudef, blatantly ripping off his cmake files for this
2015-11-12 08:17:52 -05:00
Tomáš Čech c57499d29c Use location of XKBcommon headers, don't expect build in source directory 2015-09-30 14:21:01 +02:00
Drew DeVault 8e25ce4e57 Fix build for debian stretch
Fixes #182
2015-09-18 07:16:20 -04:00
Luminarys 54b51cbe6a Updated versioning in cmake 2015-08-26 21:15:43 -05:00
minus c948432fb4 fixed json-c CMake inclusion 2015-08-27 00:06:09 +02:00