Commit Graph

75 Commits

Author SHA1 Message Date
Laurent Rineau 7f3045ee11 Remove the use of CGAL_SVN_REVISION
src/CGAL_Qt4/DemosMainWindow.cpp was the sole user of the macro
CGAL_SVN_REVISIONS, in CGAL's master branch. That macro is useless since
the switch to Git.
2013-02-21 15:26:03 +01:00
Laurent Rineau e3cb421cd2 Fix: allow the drap&drop of a collection of files, and open all of them...
... instead of opening only the first one.
2012-09-27 13:29:40 +00:00
Eric Berberich 5f524b0802 subdirectories in src finally get correct name 2012-08-03 17:21:30 +00:00
Laurent Rineau 8e167590c8 Use include_directories(SYSTEM ...) for 3rd-party libraries
gcc has an option -isystem, that can replace -I. The documentation is:

 -isystem dir

     Search dir for header files, after all directories specified by -I but
     before the standard system directories. Mark it as a system directory,
     so that it gets the same special treatment as is applied to the
     standard system directories. If dir begins with "=", then the "=" will
     be replaced by the sysroot prefix; see --sysroot and -isysroot.


The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.

In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).

This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
2012-08-01 10:53:37 +00:00
Eric Berberich bc6d9c1005 fixed typo: added missing '_' 2012-07-03 10:53:25 +00:00
Eric Berberich d4cb1c2212 SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential 2012-06-29 15:24:30 +00:00
Laurent Rineau 947dd14f31 Minor fix: ensure the OpenGL version is displayed by test results pages 2012-06-29 10:57:59 +00:00
Eric Berberich b5a4e941fd the mandatory libs need an particular order, and we simplify with a macro 2012-06-29 09:24:19 +00:00
Laurent Rineau 70e00b3d6e First fix for Windows: the auto-linking needs link_directories commands 2012-06-28 15:32:04 +00:00
Eric Berberich eb6c435c4a correct spelling of GMPXX_FOUND variable
FOUND_GMPXX -> GMPXX_FOUND
2012-06-28 13:02:32 +00:00
Eric Berberich df72a1aa08 macro use_lib now has an optional second parameter for UseFile
this avoids a nasty hack with checking for a leading ### in a string and 
allows to use "use_lib( FOO )" in other places much easier
2012-06-28 12:20:52 +00:00
Eric Berberich 67291a2c6d merge from next 2012-06-24 12:17:32 +00:00
Philipp Möller ea6635c86d Include the header with the declaration so that the declaration with
the attribute precedes the definition.
2012-06-20 10:20:27 +00:00
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
Laurent Rineau 2fbd163e14 Factorize the installation command of CGAL library into the macro
The macro build_cgal_library(..) now defines the installation rules. That
should also fix a bug: now .dll files will be installed in
${CGAL_INSTALL_BIN_DIR}.
2012-01-25 16:49:39 +00:00
Laurent Rineau 8b413cef28 Remove variables CGAL_<lib>_BASENAME: no longer used. 2012-01-25 16:37:06 +00:00
Eric Berberich 8b63cf18fd fixed spacing 2012-01-24 13:13:27 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Eric Berberich a42d72acaa CGAL_USE_GMPXX is only set by use_lib macro 2012-01-11 00:00:05 +00:00
Eric Berberich 00d31036ea build_cgal_library -> collect_cgal_library (new macro name) 2012-01-10 18:17:53 +00:00
Eric Berberich 10af9912d9 CGALcomponent libs are not own CMake projects anymore 2012-01-10 18:13:19 +00:00
Eric Berberich 9cd61d509c let QT compile 2012-01-10 12:31:59 +00:00
Laurent Rineau c37ce187ff Factorize the settings of VERSION/SOVERSION properties of libraries 2011-10-19 15:53:46 +00:00
Laurent Rineau 9059b29647 Fix and factorize post-build commands on Windows
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.

For example, the definition of mangled names is now factorized in that
function.

Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
2011-10-17 16:02:12 +00:00
Laurent Rineau 28bc7ca5c0 Add some decl spec (import|export) to CGAL_Qt4
That allows to build libCGAL_Qt4 and the Polyhedron demo with
-fvisibility-ms-compat on Linux.

That may allow to build CGAL_Qt4 as a DLL on Windows, one day.
2011-06-10 17:14:27 +00:00
Sébastien Loriot 1a6c568887 remove unused var warning 2011-06-08 07:50:16 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau 4b795c56f4 Global handling of CMake policies
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.
2011-04-28 10:33:17 +00:00
Laurent Rineau 6f05e72cef Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 18:06:32 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Laurent Rineau 59356984de In the popup "About CGAL...", do not display the SVN revision number if the
release is a public release.

If the CGAL_Qt4 library is configured while there is an environment
variable CGAL_FAKE_PUBLIC_RELEASE, then the release version string is
stripped from its -I-.* part, so that is it equivalent to the version
string of the public release.
2011-03-09 12:49:30 +00:00
Andreas Fabri ea87ef81b6 Applications shall only go on the virtual screen (based on stored settings from a previous session), if the latter is available 2010-08-31 11:32:14 +00:00
Andreas Fabri bedfdf33d8 Move event dropping into DemosMainWindow 2010-08-13 14:38:51 +00:00
Laurent Rineau 4c37f9d69c Include <CGAL/config.h>, to get <CGAL/version.h> and CGAL_VERSION_STR 2009-11-19 13:17:13 +00:00
Laurent Rineau 1fff0a4c07 Fix a bug in my last commit: include <iostream> before using std::cerr! 2009-11-19 11:37:15 +00:00
Laurent Rineau 23131c40b5 Merge change 53094 from branches/unsorted-branches/eric/CMAKE/GraphicsView 2009-11-18 15:17:14 +00:00
Laurent Rineau f3078e4547 Quote the characters '"' in post-build commands. If TargetDir==C:\Program
Files\CGAL-3.4\, that is needed.
2008-12-16 14:47:16 +00:00
Laurent Rineau ef8ef25311 Followup to revision 46867:
Swap initializers to avoid a warning from gcc: "n_ will be initialized
  after closed_".
2008-11-14 14:08:29 +00:00
Laurent Rineau 2795375b05 Swap two initializers to avoid a warning from gcc: "n_ will be initialized
after closed_".
2008-11-13 10:25:42 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Fernando Cacciola 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +00:00
Laurent Rineau cd96b8cfbc Patch to allow the use of Qt-4.2. Previoulsy we used a constructor of
QRectF, which was introduced in Qt-4.3.
2008-10-31 13:48:01 +00:00
Laurent Rineau dc947c0c0c Fix a warning. 2008-10-30 11:18:10 +00:00
Laurent Rineau 45ce44736c Attempt to be compatible with CGAL-4.2.1 2008-10-27 10:45:55 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Laurent Rineau fa27da4d5c Normalize the bounding rect, so that its height is non negative if the y
axis has been turned upside down.
2008-10-15 15:17:12 +00:00
Laurent Rineau 988e6d0429 Add writeState()/readState() to CGAL::Qt::DemosMainWindow, so that one can
save and restore the state of a main window: size, position, and position
of sub-widgets (toolbars and dock widgets, mainly).
2008-10-14 20:51:49 +00:00
Fernando Cacciola b3a611f4a0 (fixed) Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-02 18:13:13 +00:00
Fernando Cacciola 6fdf8251bd Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-01 21:38:37 +00:00