summaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Static build fix - only attempt to link against libtasn1 if it's presentBrian P. Hinz2014-11-041-1/+6
| | | | | GnuTLS may be compiled without external libtasn1, so we shouldn't try to link against it unless it's actually present.
* Back out previous changeBrian P. Hinz2014-11-041-6/+1
| | | | Needed to merge upstream changes in before creating pull request.
* Merge remote-tracking branch 'upstream/master' into buildfixesBrian P. Hinz2014-11-032-26/+79
|\
| * Handle mingw circular dependencies in base librariesPierre Ossman2014-11-031-1/+5
| | | | | | | | Our link order should now match the built-in library list.
| * Handle static linking flags in .la filesPierre Ossman2014-11-031-11/+28
| |
| * Handle arguments that have the -l prefixPierre Ossman2014-11-031-0/+6
| |
| * Split up any entries that contain multiple link argumentsPierre Ossman2014-11-031-0/+12
| | | | | | | | This happens sometimes in order to enforce a strict ordering.
| * The output variable from find_library() needs to be clearedPierre Ossman2014-11-031-0/+4
| | | | | | | | | | Otherwise you'll just get the initial response back every time you call it.
| * Remove obsolete reference to staticlibPierre Ossman2014-11-031-4/+0
| | | | | | | | We don't use that directory anymore.
| * Use dynamic builds by defaultPierre Ossman2014-10-281-1/+1
| | | | | | | | | | Static builds are the special case, so it should be left off by default.
| * Include gettext and zlib in static GnuTLS linkPierre Ossman2014-10-281-0/+9
| | | | | | | | | | This is needed to make sure they are always included, and in the proper order.
| * Only link with crypt32 on WindowsPierre Ossman2014-10-281-1/+6
| | | | | | | | | | crypt32 is a Windows thing, and it is used no matter the crypto backend.
| * Put quotes around entire static link variablesPierre Ossman2014-10-281-8/+8
| | | | | | | | | | | | CMake is very aggressive about minimising the list of libraries, so we need to be similarily aggressive about quotes to make sure we get everything we want and in the correct order.
* | Static build fix - only attempt to link against libtasn1 if it's presentBrian P. Hinz2014-11-031-1/+6
|/ | | | | GnuTLS may be compiled without external libtasn1, so we shouldn't try to link against it unless it's actually present.
* Add in missing dependency for windows builds.Brian P. Hinz2014-10-221-1/+1
| | | | Commit f95272d created some undefined references in GnuTLS.
* Extend "static" build optionPierre Ossman2014-10-171-0/+96
| | | | | Try to link as much as possible statically in an effort to produce binaries that can be run everywhere.
* Clean up GnuTLS linking and instructionsPierre Ossman2014-10-172-72/+0
| | | | | | | | | GnuTLS can have different crypto backends, and it is rarely gcrypt these days. So we should not be including that unconditionally, and should not be pointing people at it either. Also remove the section about Win32 binaries as those are out of date and probably insecure. Lastly remove the section about static builds as it is a general issue and in no way complete with just the GnuTLS portions.
* Fixes problems with cmake detection of GnuTLS. The current CMakeLists.txt ↵Brian Hinz2014-02-192-0/+72
| | | | | | uses check_function_exists to identify legacy versions of GnuTLS but cmake performs this test by linking a small test program. If libgnutls, libgcrypt, or libgpg-error are outside the default library search path, linking the test program fails even though gnutls and it's dependencies are installed. This patch makes it possible to specify the location of each of the three libraries independently and only as needed. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5160 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Use CMAKE_COMMAND variable instead of hard coded cmake executable name for ↵Brian Hinz2013-04-271-2/+2
| | | | | | better portability. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5088 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Consolidate the installation paths and make sure we have decent defaults.Pierre Ossman2012-03-271-2/+2
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4873 3789f03b-4d11-0410-bbf8-ca57d06f2519
* We don't need HAVE_GNUTLS anymore, eitherDRC2011-11-081-4/+0
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4778 3789f03b-4d11-0410-bbf8-ca57d06f2519
* If the Java viewer build is enabled, make sure it gets built when doing ↵DRC2011-11-081-0/+3
| | | | | | 'make installer' git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4777 3789f03b-4d11-0410-bbf8-ca57d06f2519
* We don't need BUILD_DIR anymore since we divorced Visual StudioDRC2011-11-081-1/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4776 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Remove Visual C++ supportDRC2011-11-082-19/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4774 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Move Java source up one level and allow Java viewer to be built as a ↵DRC2011-10-071-30/+0
| | | | | | standalone project (per community request) git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4715 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Only sign JAR when it is builtDRC2011-10-051-0/+2
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4703 3789f03b-4d11-0410-bbf8-ca57d06f2519
* OopsDRC2011-10-051-1/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4701 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Make sure that keytool and jarsigner don't die silentlyDRC2011-10-051-2/+10
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4700 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Sign the JAR file so clipboard transfer will workDRC2011-10-051-0/+20
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4699 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Integrate Java TigerVNC Viewer build into CMake build systemDRC2011-10-042-2/+13
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4690 3789f03b-4d11-0410-bbf8-ca57d06f2519
* (Re-)fix static Xvnc build. We can leverage the BUILD_STATIC option to ↵DRC2011-08-091-0/+4
| | | | | | modify our fake libtool scripts such that they pick up the static libstdc++.a. Unfortunately, adding -static-libgcc to those scripts makes libtool barf, so we still have to add that flag to LDFLAGS in build-xorg. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4614 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Consolidate all README files into one and distribute it with the binary ↵DRC2011-06-281-0/+1
| | | | | | packages. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4562 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Implement 'make tarball' and 'make servertarball'DRC2011-06-251-1/+19
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4555 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Add uninstall targetDRC2011-06-251-0/+24
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4554 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Deploy Mac TigerVNC Viewer as an application bundle instead of a package, ↵DRC2011-06-241-0/+76
| | | | | | and consolidate all of the installer scripts under release/ and cmake/ git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4538 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Fix several bugs in the generation of .la filesDRC2011-06-221-3/+3
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4512 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Translate comments into English and remove blindingly obvious ones.DRC2011-06-221-28/+32
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4511 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Tabs to spacesDRC2011-06-221-31/+31
| | | | git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4510 3789f03b-4d11-0410-bbf8-ca57d06f2519
* libtool control file should be created in binary directory, not source ↵DRC2011-06-091-4/+4
| | | | | | directory, to support out-of-tree builds. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4487 3789f03b-4d11-0410-bbf8-ca57d06f2519
* - Fixed so the library suffix is platformindependentHenrik Andersson2011-06-091-1/+9
| | | | | | | | | | - Added custom commands to create .libs and symlink to static library so that autotools can actually find the library in expected place. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4484 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Building the Xvnc server requires libtool control files of rdr, rfb,Henrik Andersson2011-06-091-0/+92
| | | | | | | | | | | | | network and Xregion, which a cmake build will NOT produce, this macro tries to create a libtool control file *.la for the specified target with libdependencies for a static library target. Due to the automake part of Xvnc references to libtool files in source tree you need to build vncviewer using cmake in the source tree. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4482 3789f03b-4d11-0410-bbf8-ca57d06f2519
* Finish up the gettext handling in CMake. The included functions in CMake onlyPierre Ossman2011-04-282-0/+69
take care of finding the gettext tools, not the headers and libraries needed to build things. Use the licq project as inspiration on how to solve this. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4389 3789f03b-4d11-0410-bbf8-ca57d06f2519