mirror of https://github.com/CGAL/cgal
Force variables CGAL_<component>_LIBRARY.
For an unkwnon reason, they are copied from the reference cache, which is wrong.
This commit is contained in:
parent
907223b777
commit
202d2b53ca
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue