songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix assembling of optimized|debug LEDA libraries

This commit is contained in:
Fernando Cacciola 2008-12-02 18:31:31 +00:00
parent 50b6d809d3
commit 4bf387c6ca
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Installation/cmake/modules/FindLEDA.cmake
View File

@ -44,7 +44,15 @@ else()
typed_cache_set( FILEPATH "The LEDA debug-mode libraries" LEDA_LIBRARY_DEBUG "$ENV{LEDA_LIBRARY_DEBUG}" ) typed_cache_set( FILEPATH "The LEDA debug-mode libraries" LEDA_LIBRARY_DEBUG "$ENV{LEDA_LIBRARY_DEBUG}" )
endif() endif()
set(LEDA_LIBRARIES optimized ${LEDA_LIBRARY_RELEASE} debug ${LEDA_LIBRARY_DEBUG} ) if(LEDA_LIBRARY_RELEASE)
if(LEDA_LIBRARY_DEBUG)
set(LEDA_LIBRARIES_ optimized ${LEDA_LIBRARY_RELEASE} debug ${LEDA_LIBRARY_DEBUG})
else()
set(LEDA_LIBRARIES_ ${LEDA_LIBRARY_RELEASE})
endif()
endif()
set(LEDA_LIBRARIES ${LEDA_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
endif() endif()

12
Installation/cmake/modules/FindQGLViewer.cmake
View File

@ -36,13 +36,13 @@ find_library(QGLVIEWER_LIBRARY_DEBUG
if(QGLVIEWER_LIBRARY_RELEASE) if(QGLVIEWER_LIBRARY_RELEASE)
if(QGLVIEWER_LIBRARY_DEBUG) if(QGLVIEWER_LIBRARY_DEBUG)
set(QGLVIEWER_LIBRARIES optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG}) set(QGLVIEWER_LIBRARIES_ optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG})
else(QGLVIEWER_LIBRARY_DEBUG) else()
set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARY_RELEASE}) set(QGLVIEWER_LIBRARIES_ ${QGLVIEWER_LIBRARY_RELEASE})
endif(QGLVIEWER_LIBRARY_DEBUG) endif()
endif(QGLVIEWER_LIBRARY_RELEASE) endif()
set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES} CACHE FILEPATH "The QGLViewer library") set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES) IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
SET(QGLVIEWER_FOUND TRUE) SET(QGLVIEWER_FOUND TRUE)