Commit Graph

57 Commits

Author SHA1 Message Date
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
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
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 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Laurent Rineau c84cf08626 That one was forgotten in the switch from LGPLv2 to LGPLv3+. 2012-01-19 16:49:52 +00:00
Laurent Rineau ac66d72114 Fix the license fix, for Core. 2012-01-13 17:09:14 +00:00
Laurent Rineau 201bb6aba4 Turn QPL into LGPLv3+. My script forgot Core. 2012-01-13 16:40:50 +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
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 dbf3ace24b merge from next 2011-09-22 07:56:49 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Eric Berberich bcdc7c3771 merge from next 2011-04-28 21:35:58 +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 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
Eric Berberich 026e830dec merge from next 2011-04-28 10:51:25 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Eric Berberich 56c034b893 merge from next 2011-04-27 22:34:14 +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 564c99c2e2 added GMP as component 2011-04-20 14:24:45 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Sébastien Loriot d4c8b655af correct CORE operator>> for Real (used by Expr).
This fix is different from the one I gave on cgal-discuss.
2010-09-24 13:07:28 +00:00
Eric Berberich 0a0b8bfda8 fix according to Sylvain's suggestion (Gmpz) and GMPlib docu 2010-08-27 20:07:55 +00:00
Eric Berberich 33746fc77a fixed memory leak because of C/C++ mix 2010-08-27 14:49:20 +00:00
Sébastien Loriot d53e01f1a1 remove package namespace macro 2010-06-09 08:45:58 +00:00
Laurent Rineau 8cdb0e6315 Add "if exists" to the VC post-build command of CGAL_Core*.pdb 2008-12-19 09:57:41 +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 777b1c4b69 bye bye install_cgal 2008-12-01 10:11:26 +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
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
Sylvain Pion 1652fec82f Add license notice. 2008-10-13 12:46:01 +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
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 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 cd00979002 Added explicit link directives from libCGAL* to libCGAL
Added OpenGL to CGALQt4
2008-09-09 18:53:02 +00:00
Fernando Cacciola ee6fae2991 Added separation in components 2008-09-03 16:55:21 +00:00
Fernando Cacciola eee090e828 soname added to CGAL_CORE (was missing) 2008-08-22 22:30:51 +00:00
Fernando Cacciola 6e36eda87b CMake stuff moved into the appropriate packages 2008-07-16 20:56:17 +00:00
Sylvain Pion 4d1b8d63e3 Remove workarounds and support for the BORLAND compiler. 2008-01-20 20:24:20 +00:00