Commit Graph

185 Commits

Author SHA1 Message Date
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
Sylvain Pion dc3bf72707 Remove changes.txt files. 2008-07-24 17:47:16 +00:00
Fernando Cacciola 6e36eda87b CMake stuff moved into the appropriate packages 2008-07-16 20:56:17 +00:00
Sylvain Pion eff6efd3af CGAL_NULL and CGAL_NULL_TYPE are now constant macros, so replace them by:
- CGAL_NULL -> NULL
- CGAL_NULL_TYPE -> CGAL::Nullptr_t (typedef to const void *)
2008-07-12 21:58:52 +00:00
Laurent Rineau 38fbd5e5ad Fix a stupid bug in apply_to_range! 2008-06-24 10:56:57 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00
Fernando Cacciola b704509dcf Examples/Demos/Test CMake scripts updated 2008-03-05 21:14:02 +00:00
Fernando Cacciola a659cd852a Added project() and conditional test for CGAL_DIR 2008-02-14 15:42:36 +00:00
Fernando Cacciola 14043c43a0 Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically) 2008-02-08 17:47:21 +00:00
Fernando Cacciola afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Sylvain Pion 65d7b12a67 Constrained_triangulation_2<> now has a 3rd template argument.
This is not innocent.
2008-01-24 12:09:29 +00:00
Sylvain Pion a46b55bf71 The files "changes.txt", "description.txt", "long_description.txt" and "maintainer"
are now under /trunk/$Package/package_info/$Package/ .
2007-12-02 15:06:42 +00:00
Andreas Meyer fdeedcf8b0 some low level code cleanup. renamed
* CGAL_error to CGAL_error_msg
* introduced a macro CGAL_error()
* added some words about CGAL_error to the developers manual
* renamed most of assert(x) into CGAL_assertion(x)
* renamed exit(x) with x != 0 , CGAL_assertion(false) and assert(false) into CGAL_error
* CORE left untouched, OpenNL changed
2007-11-07 16:51:18 +00:00
Sylvain Pion 055009cc58 Remove the need for mentionning todo files and doxygen files. 2007-11-03 21:15:36 +00:00
Sylvain Pion 4da7713aa8 Remove obsolete config flag CGAL_CFG_NO_STDC_NAMESPACE and rename
its dependant macro CGAL_CLIB_STD to "std".
2007-08-08 15:59:25 +00:00
Laurent Rineau 4fa95e966c typo
It should fix te testsuite...
2007-06-07 13:18:48 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Andreas Fabri a9b1edf177 3.3 branch -> trunk 2007-06-04 14:14:12 +00:00
Laurent Rineau bf1be8198c - Allow compiling all source files at once.
=> I forgot that file.
   (see r38823)
2007-05-24 13:13:44 +00:00
Laurent Rineau 50bdf94b7f - Allow compiling all source files at once.
- Fix compilation in-place: s/willcard/wildcard/ and some additionnel
  include paths.
2007-05-23 10:34:58 +00:00
Laurent Rineau 342cfaad7e new makefile, with more GNU stuff, to be able to compile "in place",
from the package.
2007-05-22 13:22:14 +00:00
Laurent Rineau c6021ac336 new icon for CGAL demos 2007-05-22 13:21:45 +00:00
Laurent Rineau 70f7dc9d7d - add the slot "toggle(bool)" to Qt_widget_layer(),
- the slot "stateChanged(int)" should be deprecated, one day.

Patch accepted by the release manager of CGAL-3.3: no functionnality is
removed from Qt_widget. That patch only adds a new slot to connect signals
to a Qt_widget_layer object.

Documentation updated (by copy-paste, mostly).
2007-05-04 13:32:40 +00:00
Andreas Fabri 8e2889d42d Added moc custom build steps 2007-05-03 21:05:10 +00:00
Andreas Fabri 05ffd6b117 Added moc custom build steps 2007-05-03 20:59:11 +00:00
Andreas Meyer c1e9765ff4 manual fix: moved labels inside sectioning command 2007-04-18 14:20:12 +00:00
Sylvain Pion dd7d2df96b Fix declarations of some \ccFunction to improve the manual index. 2007-04-17 09:59:18 +00:00
Andreas Fabri ea71b8eaa1 .C ->.cpp and autolinking 2007-04-11 13:59:20 +00:00
Andreas Fabri 88a5f1f46c remove unused parameter 2007-03-19 07:51:27 +00:00
Joachim Reichel d08f6bea45 replace obsolete variable CGAL_QT_LDFLAGS by CGAL_LDFLAGS 2007-03-11 09:54:17 +00:00
Sylvain Pion b2630cd7e1 Apply trailing whites-spaces and leadgin+trailing empty-lines cleanups
to demo/**/*.h and .cpp.
2007-03-10 16:55:12 +00:00
Laurent Rineau 0049115d81 Fix typo in the main() prototype. 2007-03-02 08:03:34 +00:00
Laurent Rineau f83e26cdbd Fix test: include <CGAL/basic.h> before testing if CGAL_USE_QT is defined. 2007-03-01 09:58:59 +00:00
Fernando Cacciola fb9f6e5472 Auto-linking now encapsulated in a library-specific header inside new CGAL/auto_link/ folder. 2007-02-28 17:43:49 +00:00
Laurent Rineau de6e7b227f - remove $(CUSTOM_LDFLAGS) from src/Core/makefile
- -add $(CGAL_LIBPATHFLAGS) to src/CGALQt/makefile
2007-02-23 00:17:01 +00:00
Laurent Rineau 8862a968af - fix ADDITIONNAL->ADDITIONAL
- fix flags for Core and CGALQt shared libraries
- add $(CUSTOM_LDFLAGS) to $(CGAL_SHARED_LIB_LDFLAGS)
- move a few flags from $(CGAL_CGAL_LDFLAGS) to $(CGAL_LDFLAGS), so that
  $(CGAL_CGAL_LDFLAGS) only contains -lCGAL (or the equivalent for other
  compilers).
2007-02-23 00:07:51 +00:00
Daniel Russel 81c2223738 cleaned args 2007-02-22 22:59:04 +00:00
Daniel Russel 9eab56cf47 added more search paths and link agianst CGAL 2007-02-22 22:42:07 +00:00
Laurent Rineau 1f1c86ec4d Fix stupid error: char* -> char** in void main(int, char**); 2007-02-22 20:04:27 +00:00
Laurent Rineau 31f8376377 - Rework on src/CGAL/common.mk:
- new targets for libCGAL.a, libCGAL.so, libCGAL.so.*
   - fix rules when SOVERSION is empty (use GNU/make idioms)
- Additional vpath in src/CGALQt/makefile, so that one can build it directly
  from a checkout of the trunk.
- fix the build of libCGALBenchmark.
- fix the bison special stuff, so that we no longer rely on the expr and
  the $(shell) function of GNU/make.
2007-02-22 19:58:08 +00:00
Laurent Rineau 472a4193e1 fix old references to .C files 2007-02-22 11:34:21 +00:00
Fernando Cacciola cfd35946e6 Fixed auto_link include bug 2007-02-20 12:28:35 +00:00
Fernando Cacciola e76e4eb8c3 Added vc71/80 and auto-link support 2007-02-19 14:57:59 +00:00
Laurent Rineau ca7f173838 - Add cxx flags, libpath flags and linker flags, by features, in
$CGAL_MAKEFILE.
- Fix shared libraries makefile that need to be linked with third libraries.
2007-02-16 23:00:26 +00:00
Laurent Rineau 36636d49b5 - Continue factorization between libraries' makefiles,
- install_cgal cleanup.
2007-02-16 21:00:37 +00:00
Efi Fogel c9d5f6ec43 used relative path in vpath statement for windows 2007-02-12 21:46:10 +00:00
Efi Fogel 8ce66f78d5 cleanup generic rules 2007-02-11 17:16:13 +00:00
Sylvain Pion d8d0410d41 Constification to avoid deprecation warning with upcoming g++ 4.2. 2007-02-11 17:06:50 +00:00
Laurent Rineau 4c484412e4 (Followup to revision 36164.)
"Everybody was dreaming of this commit log:
 - factorization of makefiles for libCGAL, libCGALimageIO, libCore, and
 libBenchmark.
 - SONAMEs for everybody."
Add:
 - fix platforms without SONAME,
 - unify Benchmark/src/Benchmark/makefile with other makefiles.
2007-02-09 23:33:22 +00:00
Laurent Rineau 6fa698ad67 Everybody was dreaming of this commit log:
- factorization of makefiles for libCGAL, libCGALimageIO, libCore, and
 libBenchmark.
 - SONAMEs for everybody.
2007-02-09 22:29:15 +00:00
Andreas Fabri 0f47139c39 removed newcommand \qt 2007-02-06 11:22:07 +00:00
Andreas Fabri 8a64b05eee Removed footnote 2007-02-02 14:03:53 +00:00
Andreas Fabri f8842c7193 Quote as moc doesn't understand Windows paths with colons 2007-01-29 09:12:12 +00:00
Sylvain Pion cd4ff41d33 rename .C to .cpp 2007-01-27 21:09:59 +00:00
Sylvain Pion 40d0fb8d35 Fix all "align=center" in <img> by "align=middle". 2007-01-13 21:49:03 +00:00
Laurent Rineau 47849eb988 Test commit via ssh+svn:// 2006-12-14 12:10:16 +00:00
Laurent Rineau 89e50413bc fix -lGL to $(OPENGL_LIBS)
This should probably be a third library support
2006-11-08 17:23:59 +00:00
Laurent Rineau 0e713f8f29 - add support for shared libCGALQt
- enable option "--disable-shared" in install_cgal (non interractive mode only)
2006-11-08 16:43:48 +00:00
Andreas Fabri eb026273a0 fix for min/max problem 2006-08-20 21:28:22 +00:00
Sylvain Pion e6b6cfe196 Copyright owner of Qt_widget is INRIA, not the whole 7 Galia sites. 2006-07-30 16:38:54 +00:00
Sylvain Pion 086abc351e Move file to the right package. 2006-07-30 15:58:30 +00:00
Andreas Fabri 9174c7302d changed .C to .cpp in examples 2006-07-09 21:24:10 +00:00
Andreas Meyer 6620001236 fix for solaris make 2006-05-23 13:58:21 +00:00
Andreas Fabri 62e874f582 changed some options 2006-05-05 14:02:39 +00:00
Laurent Saboret 35a6695d89 Resurrect makefile 2006-05-05 08:04:33 +00:00
Laurent Saboret e42659d1a4 Fixed svn:executable, svn:keywords and svn:eol-style properties of the whole trunk 2006-05-04 09:15:26 +00:00
Andreas Meyer 1e2a7e9df6 manual tools workaround not needed anymore 2006-05-03 15:22:27 +00:00
Andreas Fabri 8a978b8194 Removed CGAL_ROOT 2006-05-02 09:28:52 +00:00
Andreas Fabri 16156b785f Added one moc call in debug mode 2006-04-27 20:39:29 +00:00
Andreas Fabri e1bf34e136 Before, the examples were in a subdirectory 2006-04-27 13:26:20 +00:00
Andreas Fabri 0085b87132 Before, the examples were in a subdirectory 2006-04-27 13:23:26 +00:00