From 202d2b53cadd7f623842418e8d7df7c01ed2a210 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 29 Sep 2008 10:09:35 +0000 Subject: [PATCH] Force variables CGAL__LIBRARY. For an unkwnon reason, they are copied from the reference cache, which is wrong. --- CGALimageIO/src/CGALimageIO/CMakeLists.txt | 2 +- Core/src/CGALCore/CMakeLists.txt | 2 +- GraphicsView/src/CGALQt4/CMakeLists.txt | 2 +- Installation/src/CGAL/CMakeLists.txt | 2 +- PDB/src/CGALPDB/CMakeLists.txt | 2 +- Qt_widget/src/CGALQt/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CGALimageIO/src/CGALimageIO/CMakeLists.txt b/CGALimageIO/src/CGALimageIO/CMakeLists.txt index 7f26fe62681..4777437c053 100644 --- a/CGALimageIO/src/CGALimageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALimageIO/CMakeLists.txt @@ -79,7 +79,7 @@ if(ZLIB_FOUND AND OPENGL_FOUND) get_target_property( CGAL_ImageIO_LIBRARY_FULL_PATH CGAL_ImageIO LOCATION ) - set(CGAL_ImageIO_LIBRARY "${CGAL_ImageIO_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library") + set(CGAL_ImageIO_LIBRARY "${CGAL_ImageIO_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library" FORCE) mark_as_advanced(CGAL_ImageIO_LIBRARY) diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index f9481abfb36..f44e13133eb 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -40,7 +40,7 @@ if( GMP_FOUND AND MPFR_FOUND ) get_target_property( CGAL_CORE_LIBRARY_FULL_PATH CGAL_CORE LOCATION ) - set(CGAL_CORE_LIBRARY ${CGAL_CORE_LIBRARY_FULL_PATH} CACHE STRING "The CGAL-core++ library" ) + set(CGAL_CORE_LIBRARY ${CGAL_CORE_LIBRARY_FULL_PATH} CACHE STRING "The CGAL-core++ library" FORCE) mark_as_advanced(CGAL_CORE_LIBRARY) diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index 53bd22b20d5..e864a89555b 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -81,7 +81,7 @@ if( QT4_FOUND ) set_target_properties( CGAL_Qt4 PROPERTIES OUTPUT_NAME "${CGAL_Qt4_BASENAME}" ) get_target_property( CGAL_Qt4_LIBRARY_FULL_PATH CGAL_Qt4 LOCATION ) - set(CGAL_Qt4_LIBRARY "${CGAL_Qt4_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt4 library") + set(CGAL_Qt4_LIBRARY "${CGAL_Qt4_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt4 library" FORCE) mark_as_advanced(CGAL_Qt4_LIBRARY) else() diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 12967b27e00..2446fe28acb 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -37,7 +37,7 @@ if (NOT AUTO_LINK_ENABLED ) get_target_property( CGAL_LIBRARY_FULL_PATH CGAL LOCATION ) - set(CGAL_LIBRARY "${CGAL_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL library" ) + set(CGAL_LIBRARY "${CGAL_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL library" FORCE) hide_variable(CGAL_LIBRARY) diff --git a/PDB/src/CGALPDB/CMakeLists.txt b/PDB/src/CGALPDB/CMakeLists.txt index 26cde5e20b0..b71a7cc9415 100644 --- a/PDB/src/CGALPDB/CMakeLists.txt +++ b/PDB/src/CGALPDB/CMakeLists.txt @@ -39,7 +39,7 @@ if (NOT AUTO_LINK_ENABLED ) get_target_property( CGAL_PDB_LIBRARY_FULL_PATH CGAL_PDB LOCATION ) - set(CGAL_PDB_LIBRARY "${CGAL_PDB_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-PDB library") + set(CGAL_PDB_LIBRARY "${CGAL_PDB_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-PDB library" FORCE) mark_as_advanced(CGAL_PDB_LIBRARY) diff --git a/Qt_widget/src/CGALQt/CMakeLists.txt b/Qt_widget/src/CGALQt/CMakeLists.txt index 6c7b0b4208f..84b4dfb6d47 100644 --- a/Qt_widget/src/CGALQt/CMakeLists.txt +++ b/Qt_widget/src/CGALQt/CMakeLists.txt @@ -120,7 +120,7 @@ if( QT3_FOUND ) get_target_property( CGAL_Qt3_LIBRARY_FULL_PATH CGAL_Qt3 LOCATION ) - set(CGAL_Qt3_LIBRARY "${CGAL_Qt3_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt3 library") + set(CGAL_Qt3_LIBRARY "${CGAL_Qt3_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt3 library" FORCE) mark_as_advanced(CGAL_Qt3_LIBRARY)