Commit Graph

155 Commits

Author SHA1 Message Date
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 c97205f085 Global handling of CMake policies (second part)
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.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +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
Laurent Rineau ca5c92e034 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 17:58:27 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Eric Berberich 2733a26a3f Qt -> Qt3 2011-04-15 08:43:49 +00:00
Laurent Rineau 5604fef79f Move <CGAL/apply_to_range.h> to trunk/Triangulation_2...
... to avoid that useful file to be removed by error if we remove
trunk/Qt_widget one day (but also because it is more logical).
2011-03-29 09:38:36 +00:00
Sébastien Loriot a2cec87f46 replace remaing fabs in include files by CGAL::abs 2011-02-18 15:37:40 +00:00
Laurent Rineau cdf0322256 Let's remove all makefiles, now. 2010-08-23 11:03:02 +00:00
Michael Hemmer bd1840fe6d rm ambig 2010-03-11 13:46:27 +00:00
Sylvain Pion 5fda817f95 Remove a few "warning: extra ';'" with g++ -pedantic. 2009-11-14 11:49:52 +00:00
Sylvain Pion ce603c5c51 Remove more EPS files. 2009-09-18 12:53:31 +00:00
Sylvain Pion 7ce05dfb37 Remove obsolete makefile 2009-08-20 14:13:13 +00:00
Sylvain Pion 2bdf828dfd Unless I am mistaken, those pre-CMake makefiles are obsolete. 2009-08-20 11:45:12 +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
Andreas Fabri 2a696d253c bye bye install_cgal 2008-12-01 10:19:22 +00:00
Laurent Rineau a0e6c6dbed Remove doc_tex from the internal releases, so that Qt_widget no longer
appears in the Manual test suite as a single-package manual. That package
has already been removed from the global manual.
2008-11-28 13:43:51 +00:00
Laurent Rineau b861e82892 Fix conditionnal compilation. Do not compile Qt3 demos if CGAL_Qt3 is not found. 2008-11-20 13:22:51 +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 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Fernando Cacciola 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Laurent Rineau f10a590672 Mass-remove vcproj files. 2008-10-21 09:21:22 +00:00
Laurent Rineau 6ba85fd527 Correct call to get_dependency_version, for Qt3 and OpenGL. 2008-10-15 14:14:08 +00:00
Sylvain Pion 1652fec82f Add license notice. 2008-10-13 12:46:01 +00:00
Andreas Fabri bbd746515b fixed typo 2008-10-07 07:47:08 +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
Andreas Fabri e74fd88166 Conditional compilation 2008-10-02 07:16:33 +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
Andreas Fabri 9a620b7e33 As we deprecate Qt_widget we don't give demos for the package itself 2008-10-01 08:19:00 +00:00
Laurent Rineau 202d2b53ca Force variables CGAL_<component>_LIBRARY.
For an unkwnon reason, they are copied from the reference cache, which is wrong.
2008-09-29 10:09:35 +00:00
Laurent Rineau bdb278ab9a Fix bug: print_QT3_version.cpp does not exist, print_QT_version.cpp does. 2008-09-24 13:13:39 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged).
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
2008-09-24 10:32:44 +00:00
Fernando Cacciola 502c3f271f Added libCGAL to libCGAL-Qt3
Avoid detecting flags at user-program configuration
2008-09-12 18:58:38 +00:00
Laurent Rineau d1e19517c4 Oops! I forgot to s/QT_/QT3_/ in src/CGALQt/CMakeLists.txt 2008-09-10 08:17:37 +00:00
Laurent Rineau a3ded4f069 Remove CGAL_USE_QT3 from config.h (cmake stuff) 2008-09-09 22:36:16 +00:00
Laurent Rineau 410f435d21 6th pass to remove CGAL_USE_QT: remove "#ifdnef CGAL_USE_QT"/"#else"/"#endif" 2008-09-09 22:20:48 +00:00
Fernando Cacciola cd00979002 Added explicit link directives from libCGAL* to libCGAL
Added OpenGL to CGALQt4
2008-09-09 18:53:02 +00:00
Laurent Rineau 7306ccbf56 Make FindQt3.cmake use variables prefixed by QT3_, instead of QT_ (that was
conflicting with FindQt4.cmake).
2008-09-09 12:18:11 +00:00
Laurent Rineau 3ec3e6db96 Remove CGAL_USE_QT from src/CGALQt 2008-09-08 13:15:39 +00:00
Fernando Cacciola ab07405874 Use unique names for example, demo and test targets
Renamed CGAL-Qt as CGAL-Qt3
Re-spelled cgal components as CORE, ImageIO, PDB, Qt3 and Qt4
2008-09-04 18:58:09 +00:00
Fernando Cacciola ee6fae2991 Added separation in components 2008-09-03 16:55:21 +00:00
Fernando Cacciola 8bd571a638 Added OpenGL libraries to CGALQt and CGALimageIO 2008-08-27 17:57:10 +00:00
Fernando Cacciola 6dbc87028a Fix minor error 2008-08-22 22:28:23 +00:00
Fernando Cacciola 717b7cf5fb soversion added 2008-08-22 22:25:25 +00:00
Fernando Cacciola a84b7f58a2 Fixed variable handling within subdirectories 2008-08-22 21:50:04 +00:00
Fernando Cacciola ee7cba9c38 Improved/Fixed dependencies and related CGAL_USE_* flags
OpenGL and QT3 are now searched by Qt_widget alone.
2008-08-22 17:47:49 +00:00
Sylvain Pion e4073e2c30 Use object_cast instead of assign 2008-07-29 13:49:05 +00:00