Commit Graph

76 Commits

Author SHA1 Message Date
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
Eric Berberich 8ba476b328 added missing config flag 2012-01-24 13:13:43 +00:00
Laurent Rineau 379ad4f80c Fix the wording of LGPLv3+ so that licensecheck detects it well 2012-01-16 14:14:28 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 894b8c36d5 patch to prevent integer overflow 2011-12-29 08:14:37 +00:00
Laurent Rineau c37ce187ff Factorize the settings of VERSION/SOVERSION properties of libraries 2011-10-19 15:53:46 +00:00
Laurent Rineau 4b135885d0 I forgot to commit that yesterday 2011-10-18 13:20:08 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Andreas Fabri ba3e327a2f Suppress a conversion warning 2011-10-12 12:52:48 +00:00
Sébastien Loriot 3dfc826c51 LGPLv2.1 -> LGPLv3 for ImageIO 2011-10-10 14:04:01 +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
Laurent Rineau ff2044190d Fix the branch-build in next 2011-04-15 09:33:26 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Laurent Rineau d2fa7372e4 Let libCGAL_ImageIO set temporarily the LC_NUMERIC locale to "C", during
the read/write operation of Inrimage headers. Otherwise the I/O operations
can fail when the decimal point is not a dot.
2010-10-04 08:20:48 +00:00
Sylvain Pion 34db2978c4 Remove unused makefiles. 2009-08-20 14:08:25 +00:00
Sylvain Pion 2815308795 Remove obsolete makefiles 2009-08-20 13:58:35 +00:00
Laurent Rineau b6f567e260 add a new cmake variable in CGALConfig.cmake, so that one can detect if CGAL_ImageIO is build with ZLIB support. Use that variable in examples/Mesh_3/. 2009-07-23 15:02:02 +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 7d2ac1e8d7 Hide the option "WITH_VTK". Adventurous users may have problems with the
side-effects of it (mainly, FindVTK.cmake overrides CPP flags, and even the
CMAKE_CXX_COMPILER!!).
2008-12-15 09:56:35 +00:00
Laurent Rineau 0d17a78554 - Remove QUIET.
- Fix the inclusion of OPENGL variables in CGAL_ImageIO_3RD_PARTY_*, when
  ZLIB is not found.
2008-11-19 09:10:30 +00:00
Laurent Rineau 7664f90543 Make ZLib an *optional* dependency. 2008-11-18 14:19:38 +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
Andreas Fabri 9597450d53 Suppress deprecated warning for fileno and strdup 2008-10-31 21:02:10 +00:00
Laurent Rineau 6f789d3e94 Add -DCGAL_USE_ZLIB, so that zlib code is activated. 2008-10-30 16:26:10 +00:00
Laurent Rineau c7c2ee29fb Fix CGAL_ImageIO_ERG_PARTY_* variables, when VTK is used. 2008-10-30 11:19:00 +00:00
Laurent Rineau ac69199dbd Add the implementation of _createImage, which was missing. 2008-10-30 09:47:56 +00:00
Laurent Rineau e89f1739ab Remove a debug output. 2008-10-30 09:46:54 +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 de29665fc0 - License modification: now LGPL v2.1.
- Pierre has not modified include/CGAL/Image_3_vtk_interface.h: I am the
  only author.
2008-10-17 08:39:19 +00:00
Sylvain Pion 1652fec82f Add license notice. 2008-10-13 12:46:01 +00:00
Laurent Rineau 43cc745311 Commit work of previous days (week-end, yesterday and this morning):
The surface mesher Qt4 demo can now deal with labellized images.
2008-10-07 13:00:59 +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
Laurent Rineau 8ebe4539d2 Followup of revision 45554:
"prefix enum values by CGAL_, to avoid a conflict with windows.h on
 WIndows!"

There was still some conflicts, in other files.
2008-09-16 12:45:40 +00:00
Laurent Rineau 7d412a1ac7 prefix enum values by CGAL_, to avoid a conflict with windows.h on WIndows! 2008-09-15 14:30:53 +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 d4affa0e84 Add libCGAL as a dependency of CGALimageIO. 2008-09-08 17:26:03 +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 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 9949de466f Add CGAL as a dependency for ImageIO 2008-08-22 17:43:23 +00:00
Laurent Rineau c8bf73082e Leftover of revision 45057:
"- Make CGALimageIO compile at once (and not in two compilation units)."

I forgot to modify the (non-cmake) makefile.
2008-08-22 09:11:40 +00:00