Commit f2e7e195 authored by Thery Sylvain's avatar Thery Sylvain

Pb compilation (utilisation of QtSvg) on mac & windows

parent c6088ade
...@@ -34,7 +34,7 @@ QT4_WRAP_UI( tuto2_ui tuto2.ui ) ...@@ -34,7 +34,7 @@ QT4_WRAP_UI( tuto2_ui tuto2.ui )
QT4_WRAP_CPP(tuto2_moc tuto2.h) QT4_WRAP_CPP(tuto2_moc tuto2.h)
add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui} ${tuto2_moc}) add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui} ${tuto2_moc})
target_link_libraries( tuto2 target_link_libraries( tuto2
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} QtSvg) ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(tuto3_moc tuto3.h) QT4_WRAP_CPP(tuto3_moc tuto3.h)
add_executable( tuto3 tuto3.cpp ${tuto3_moc}) add_executable( tuto3 tuto3.cpp ${tuto3_moc})
...@@ -89,7 +89,7 @@ target_link_libraries( tp_master ...@@ -89,7 +89,7 @@ target_link_libraries( tp_master
QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h) QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui} ${tuto_histo_moc}) add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui} ${tuto_histo_moc})
target_link_libraries( tuto_histo target_link_libraries( tuto_histo
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} QtSvg) ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
#BOOST_LIBS macro: allow using compiled boost in windows (see readme) #BOOST_LIBS macro: allow using compiled boost in windows (see readme)
......
...@@ -96,13 +96,14 @@ IF (WITH_ZINRI) ...@@ -96,13 +96,14 @@ IF (WITH_ZINRI)
ENDIF (WITH_ZINRI) ENDIF (WITH_ZINRI)
IF (WITH_QT) IF (WITH_QT)
SET(QT_USE_QTOPENGL TRUE)
SET(QT_USE_QTSVG TRUE)
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
add_definitions(-DWITH_QT) add_definitions(-DWITH_QT)
SET(QT_USE_QTOPENGL TRUE)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${QT_DEFINITIONS})
SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR}) SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR})
SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES}) SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} )
ENDIF (WITH_QT) ENDIF (WITH_QT)
#IF (WITH_NUMERICAL) #IF (WITH_NUMERICAL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment