Commit Graph

89 Commits

Author SHA1 Message Date
Laurent Rineau 46b70b7c25 Fix again FindQGLViewer.cmake so that it deals with debug and release
libraries, even on Linux where only the release one exists.

Rename QGLVIEWER_LIBRARY to QGLVIEWER_LIBRARIES (-IES), to mimic other
CMake packages.
2008-11-27 15:20:46 +00:00
Fernando Cacciola 82047a7559 Fixed unnecessary tagged libraries stuff 2008-11-26 15:26:36 +00:00
Laurent Rineau 2d54bbdf5f s/WARNING:/NOTICE:/ so that one can have a blue 'r' (missing requirement)
instead of a yellow 'y' (warning) in test results.
2008-11-25 22:28:41 +00:00
Fernando Cacciola 09cc8a35db Added macros to properly arranged tagged libraries listings 2008-11-21 19:00:02 +00:00
Laurent Rineau f336f4340e Followup to revision 46844.
Attempt to search in $QTDIR/bin first, before searching in $PATH.
2008-11-19 13:52:09 +00:00
Michael Kerber 86fe5c6df1 LEDA Version is detected also when path and lib are passed by cmake-arguments 2008-11-18 09:32:12 +00:00
Laurent Saboret fdf2b32c26 - Removed CGAL_USE_BLAS/CGAL_USE_LAPACK #defines (unused).
- Do not call find_package() anymore.

- Protect scripts against multiple inclusions.
2008-11-17 10:39:37 +00:00
Laurent Saboret 9b6db227a8 - Bug fix: force variables value in cache.
- Removed QUIET parameter from calls to find_package().
2008-11-17 10:37:22 +00:00
Andreas Fabri f31433798a LaurentS's fixes for cmake cache 2008-11-14 15:21:32 +00:00
Fernando Cacciola 7062842d64 Fixed LEDA version detection 2008-11-13 18:01:24 +00:00
Laurent Saboret bcb9e6a8af - Make sure that FindLAPACK.cmake always calls find_package(BLAS).
- Added BLAS_INCLUDE_DIR and LAPACK_INCLUDE_DIR to support CBLAS/CLAPACK on Windows. This is the default on win64.
2008-11-13 17:22:53 +00:00
Laurent Rineau 62e8f40ba3 Call find_package(BLAS QUIET), even if LAPACK_LIBRARIES_DIR or
LAPACK_LIBRARIES is set.
2008-11-13 10:55:13 +00:00
Laurent Rineau 3ba325a39e Typo. That made CGAL-3.4-I-494's test suite be fully red. 2008-11-13 09:17:06 +00:00
Laurent Saboret 6c2703299f Special case for autotest_cgal_with_cmake:
On Windows/VC++, $CGAL_TAUCS_DIR can point to a folder containing the output of
build_taucs_win32_for_CGAL.bat/build_taucs_win64_for_CGAL.bat,
ie TAUCS libraries compiled for all Windows runtimes.
2008-11-12 17:32:35 +00:00
Laurent Saboret cbee4a7769 Code cleaning 2008-11-12 17:18:48 +00:00
Laurent Saboret f66afc0c1f Bug fix:
Fix use of BLAS_LIB_DIR and LAPACK_LIB_DIR environment variables.
2008-11-12 17:14:14 +00:00
Laurent Saboret f7909a4674 - Code cleaning:
Add back CGAL_USE_TAUCS, CGAL_USE_BLAS, CGAL_USE_LAPACK #defines. Only CGAL_USE_TAUCS is currently used. The others are defined by symmetry with other third-party libraries.

- Bug fix: 
Call find_package(LAPACK) before including CGAL_UseLAPACK.cmake. 
Idem for BLAS.
2008-11-12 17:11:22 +00:00
Laurent Rineau 3192eeb9d8 Fix my stupid revision 46847: "Do not display "Building (shared|static)
libraries" during the configuration of an example or a demo."
2008-11-12 17:00:52 +00:00
Fernando Cacciola 353864cf4a Added workaround to SET bug in cmake 2.6
Added link_libraries in UseCGAL (but did not remove target_link_libraries from the programs)
2008-11-12 16:49:55 +00:00
Laurent Rineau 2cabf4a168 Do not display "Building (shared|static) libraries" during the
configuration of an example or a demo.
2008-11-12 15:00:15 +00:00
Laurent Rineau 4f69d413d6 Attempt to fix Qt3 support when Qt4 is installed and /usr/bin/qmake is
Qt4's one.
2008-11-12 13:24:34 +00:00
Laurent Rineau dc59756edd Use get_dependency_version(LEDA). That will compile and run
config/support/print_LEDA_version.cpp
2008-11-12 10:37:36 +00:00
Fernando Cacciola 48f5914fc0 Renamed the cmake variable CGAL_LEDA_VERSION as LEDA_VERSION for consistency with all the other LEDA related cmake variables 2008-11-10 16:10:21 +00:00
Laurent Rineau 38e5a4ebf5 Fix the use of Boost program options. 2008-11-10 10:23:40 +00:00
Fernando Cacciola f03d9122b2 Fixed uniquely_add_flags for multiple flags added in the same call as it happens when the reference cache is loaded 2008-11-07 18:11:04 +00:00
Fernando Cacciola 5baa371e4c Fixed link order 2008-11-07 18:09:47 +00:00
Fernando Cacciola 0d67a24c0f Allow users to secify DEBUG and RELEASE variants of the leda libs 2008-11-07 17:12:08 +00:00
Fernando Cacciola eb788696c8 Fixed GNUCC->GNUCXX and detection of GCC 2008-11-07 16:46:03 +00:00
Fernando Cacciola 17389a0ed8 Override fags from CGALConfig in the cache as well as in memory 2008-11-07 16:44:23 +00:00
Laurent Rineau 1fd219bf27 Fix a comment in endif() and remove the "echo Coucou" that I inserted for
easy debugging.
2008-11-07 15:10:08 +00:00
Laurent Rineau 61925b0d2b Followup to revision 46743:
"  Modify the BLAS/LAPACK/TAUCS support to mimic other FindXYZ.cmake modules:
    - a XYZ_USE_FILE variable is defined,
    - the module ${XYZ_USE_FILE} is responsible for using the variables defined 
      by FindXYZ.
"

I should have tested that before the commit.
2008-11-07 15:00:33 +00:00
Laurent Rineau bf093806d7 Modify the BLAS/LAPACK/TAUCS support to mimic other FindXYZ.cmake modules:
- a XYZ_USE_FILE variable is defined,
  - the module ${XYZ_USE_FILE} is responsible for using the variables defined 
    by FindXYZ.
2008-11-07 14:37:14 +00:00
Laurent Rineau fe3c92fe42 In testsuite, we want the default built type to be "Debug", and not
"Release".
2008-11-06 10:40:43 +00:00
Fernando Cacciola aea1cd261c Fixed CGALConfig overriding 2008-11-05 17:02:33 +00:00
Laurent Saboret 3fc829bd02 Fixed crashing bug on MacOS X:
Search BLAS/LAPACK Fortran interface before the C interface, because the Fortran interface is standardized and the C one not. CGAL supports currently only ACML C interface.
2008-11-05 12:45:57 +00:00
Laurent Saboret 6fe6e23bd8 Include CGAL_GeneratorSpecificSettings to define CGAL_AUTO_LINK_ENABLED 2008-11-05 12:42:49 +00:00
Fernando Cacciola 8e65f1a63d renamed cmake/modules to lib/CGAL-3.4 (1.5/1) 2008-11-04 16:03:27 +00:00
Fernando Cacciola 015e9639aa renamed cmake/modules to lib/CGAL-3.4 (1/1) 2008-11-04 16:02:15 +00:00
Laurent Saboret 24c27026ba Move packages to trunk root 2006-02-14 08:58:15 +00:00