Commit Graph

215 Commits

Author SHA1 Message Date
James Le Cuirot bd1db368b3
Add BARRIER_USE_EXTERNAL_GTEST CMake option to use external GTest 2020-08-21 23:13:58 +01:00
James Le Cuirot 4a031b8ce5
Add BARRIER_BUILD_TESTS CMake option to make tests optional 2020-08-21 22:56:57 +01:00
Dom Rodriguez dbd10820c3
Merge pull request #585 from chewi/pthread
Use -pthread flag and simplify pthread build logic
2020-05-12 23:13:16 +01:00
Chris Simons 0deaaad2c9 added barrierc and barriers to macdeployqt targets
macdeployqt needs "-executable=filename" to propery
change linking on other variables

also renamed the cmake target from "Barrier_dmg" to
"Barrier_MacOS" to properly reflect earlier changes
2020-05-04 09:37:18 -07:00
Chris Simons 8cd59ebee7 Use `build_dist.sh` in CMake instead of `build_installer.sh`
Have CMake always build a bundle, the `build_dist.sh` script will only build a dmg if the build type is "Release"
2020-05-02 12:33:09 -07:00
James Le Cuirot af0ce63733
Only require Qt5 when building the GUI
Commit 6c888437 made Qt5 mandatory for all builds when it is only
required for the GUI. There's already a find_package call in src/gui,
it just needed the REQUIRED flag to be added.
2020-03-17 22:45:20 +00:00
James Le Cuirot a0b3124f80
Use -pthread flag and simplify pthread build logic
Sometimes -lpthread is not enough. This has caused build failures on
Gentoo Linux in the past.

The logic also seems needlessly complex. We check for HAVE_PTHREAD on
UNIX platforms even though CMake errors out if pthreads are not
found. Similarly, we have a fallback for HAVE_PTHREAD_SIGNAL being
false even though we always set it to true.
2020-03-10 21:10:48 +00:00
Tetja Rediske 93a4035409 make non-gui variants build without avahi 2019-10-19 00:28:13 +02:00
Aaron Bieber 459c136036
tell build system about openbsd 2019-10-16 17:35:30 -06:00
Adrian Lucrèce Céleste 1bdc95a498
[CMake] properly declare FPIC
use CMAKE_POSITION_INDEPENDENT_CODE instead of manually addinf -fPIC to CXX args.

	modified:   CMakeLists.txt
2019-08-23 15:40:36 -04:00
Dom Rodriguez 6c88843771
Fix: CMake now checks for required Qt5 libraries
This won't fix #402 completely, but it *will* help mitigate similar
issues with Qt5 libraries during compilation in the future.
2019-08-18 22:29:19 +01:00
Dom Rodriguez f399c8c642
Feature: CMake now generates compile_commands.json
This commit adds suppotr for generating a 'compile commands' JSON
file. This provides fairly sufficient autocomplete support for most text
editors, such as (Neo)vim and VS Code. It specifies include paths, and
the compiler arguments used to compile each source file.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2019-07-25 13:46:00 +01:00
noisyshape 6a70ef9efb Create version number for wix 2019-04-12 10:49:49 -04:00
Jim Westfall cb1d116cce
Fix OSX builds for macports
macports command is 'port' not 'ports'
2019-01-02 16:41:43 -08:00
Miroslav Lences 730c065ee7 Fix macos build issues 2018-12-29 03:05:20 +01:00
Povilas Kanapickas b8fa610f8f Build full installer via clean_build.sh (#157)
* OSX: Fix lack of newlines in build messages

* OSX: Build full installer as part of the installer build via cmake
2018-10-19 13:17:04 -04:00
coypu c7c14f02dd Also add curl include directories.
While here, use the variables from FindCURL.cmake
2018-08-02 15:46:01 +03:00
walker0643 5498836b6f fix formatting in last merge 2018-07-03 16:55:57 -04:00
Adrian Lucrèce Céleste cc69299ea3
Merge pkgconfig branch into master (#86)
* use pkg-config for finding avahi include dir

* [Travis] bring up to date
2018-07-02 23:21:08 -04:00
Povilas Kanapickas 5467b90982 OSX: Prefer Macports over Homebrew if available 2018-07-02 22:33:42 +03:00
Povilas Kanapickas f928c81afc OSX: Add support for building on macports 2018-07-02 22:33:21 +03:00
walker0643 e88bc97e63 non-GUI build should not require bonjour headers 2018-06-30 13:26:18 -04:00
walker0643 12ed71250a use cpack to provide package build target 2018-03-19 13:16:06 -04:00
walker0643 b9a59c014f don't build barrierd for non-windows platforms; removed some synergy-related legacy checks 2018-03-11 12:48:59 -04:00
walker0643 3edbc00397 fix X11 crash if DISPLAY is not valid 2018-03-04 16:21:41 -05:00
walker0643 625253a7e8 fix FreeBSD build 2018-03-02 18:36:31 -05:00
walker0643 db1e05ff08 integrate inno installer into cmake 2018-03-01 10:57:13 -05:00
walker0643 f12bfdfedc rebranding symless/synergy to debauchee/barrier 2018-01-27 16:48:17 -05:00
Andrew Nelless c20346971d Move version number handling out of main CMake file 2017-05-27 14:01:49 +01:00
Andrew Nelless 43948f7871 Merge pull request #6048 , fixes #5844
Fix icon paths on Linux
2017-05-23 10:58:28 +01:00
Andrew Nelless 7c89fdb6eb Update CMakeLists.txt 2017-05-23 02:37:03 +01:00
Andrew Nelless 7f48685411 Update CMakeLists.txt 2017-05-23 02:32:45 +01:00
Andrew Nelless 5f7e047484 Always set SYNERGY_SNAPSHOT_INFO 2017-05-23 02:11:51 +01:00
Connor Lirot da2754d41e Fix icon installation path on Linux 2017-05-22 19:57:02 -05:00
Andrew Nelless dbdb033bcc Fix SYNERGY_SNAPSHOT_INFO for non-snapshot builds 2017-05-22 17:34:43 +01:00
Andrew Nelless 8d92b7ad45 More CMake version number tweaking 2017-05-22 16:04:57 +01:00
Andrew Nelless ca830f267a Use 8 characters for SYNERGY_REVISION 2017-05-22 14:30:12 +01:00
Andrew Nelless e041af6010 Add support for BUILDS_TODAY to CMake 2017-05-22 11:09:58 +01:00
Andrew Nelless 0f137543e4 Generate useful release tag in RPM specfile 2017-05-22 09:52:27 +01:00
Andrew Nelless b52eb95f41 Tweak version handling again 2017-05-21 23:59:15 +01:00
Andrew Nelless 9732e3f9bc Revert "Configure debian package directory"
This reverts commit 17abdefd20.
2017-05-09 11:21:51 +01:00
Andrew Nelless 17abdefd20 Configure debian package directory 2017-05-09 11:12:20 +01:00
Jerry (Xinyu Hou) 0888b1228c Remove typo 2017-05-04 21:05:46 +01:00
Jerry (Xinyu Hou) 29ca4b76ac Stop building installer if specified 2017-05-04 21:00:49 +01:00
Jerry (Xinyu Hou) 58eb7952a6 Allow skip building old GUI 2017-05-04 20:10:06 +01:00
Andrew Nelless fe117db525 Force -DNDEBUG on non-Debug CMake builds 2017-04-27 17:01:54 +01:00
Andrew Nelless 242f1e7e29 Rename VERSION to SYNERGY_VERSION 2017-04-27 16:14:46 +01:00
Andrew Nelless 876744ad2c Cleanup version number handling in CMake 2017-04-27 15:40:23 +01:00
Andrew Nelless d7e1b79733 Cleanup CMakeLists 2017-04-27 14:03:20 +01:00
Andrew Nelless 032ca5cf30 Remove duplicated install process between RPM spec and CMake 2017-04-27 12:26:01 +01:00