Commit 71d18d7b authored by Sylvain Thery's avatar Sylvain Thery

Merge branch 'develop' of icube-forge.unistra.fr:thery/cgogn into develop

parents c8efe8e3 abd7d455
...@@ -107,11 +107,9 @@ link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) ...@@ -107,11 +107,9 @@ link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
IF (CGoGN_ONELIB) IF (CGoGN_ONELIB)
IF(CGoGN_WITH_QT) IF(CGoGN_WITH_QT)
add_definitions(-DCGoGN_QT_DLL_EXPORT)
add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils_withQt}) add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils_withQt})
qt_use_modules(cgogn Gui OpenGL Xml Svg) qt_use_modules(cgogn Gui OpenGL Xml Svg)
IF(${CGoGN_DESIRED_QT_VERSION} STREQUAL "5")
qt_use_modules(cgogn Widgets)
ENDIF()
ELSE() ELSE()
add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils} ) add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils} )
ENDIF() ENDIF()
......
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