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

First fix for Windows: the auto-linking needs link_directories commands

This commit is contained in:
Laurent Rineau 2012-06-28 15:32:04 +00:00
parent 455fcb0109
commit 70e00b3d6e
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CGALimageIO/src/CGALImageIO/CMakeLists.txt
View File

@ -50,6 +50,8 @@ if(OPENGL_FOUND)
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ) include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
collect_cgal_library( CGAL_ImageIO CGALImageIO "") collect_cgal_library( CGAL_ImageIO CGALImageIO "")
add_dependencies( CGAL_ImageIO CGAL ) add_dependencies( CGAL_ImageIO CGAL )

2
Core/src/CGALCore/CMakeLists.txt
View File

@ -10,6 +10,8 @@ include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
collect_cgal_library(CGAL_Core CGALCore "") collect_cgal_library(CGAL_Core CGALCore "")
target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ) target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )

2
GraphicsView/src/CGALQt4/CMakeLists.txt
View File

@ -65,6 +65,8 @@ if( QT4_FOUND )
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} ) include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
collect_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}") collect_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}")
add_dependencies( CGAL_Qt4 CGAL ) add_dependencies( CGAL_Qt4 CGAL )

2
Qt_widget/src/CGALQt3/CMakeLists.txt
View File

@ -46,6 +46,8 @@ if( QT3_FOUND )
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} ) include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
# Make sure QT3_AUTOMOC compiler can find CGALQt3 include files # Make sure QT3_AUTOMOC compiler can find CGALQt3 include files
include_directories( BEFORE ${CGAL_INCLUDE_DIRS} ) include_directories( BEFORE ${CGAL_INCLUDE_DIRS} )