Commit 0b676145 authored by Thery Sylvain's avatar Thery Sylvain

resolve dylib mac compilation pb

parent 6e701b3d
...@@ -144,7 +144,7 @@ IF (WITH_QT) ...@@ -144,7 +144,7 @@ IF (WITH_QT)
find_package(QGLViewer REQUIRED) find_package(QGLViewer REQUIRED)
SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR} ${QGLVIEWER_INCLUDE_DIR} ) SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR} ${QGLVIEWER_INCLUDE_DIR} )
SET (CGoGN_EXT_LIBS ${QGLVIEWER_LIBRARIES} ${QT_LIBRARIES} ${CGoGN_EXT_LIBS}) SET (CGoGN_EXT_LIBS ${QGLVIEWER_LIBRARIES} ${QT_LIBRARIES} ${CGoGN_EXT_LIBS})
MESSAGE( "LIBS=" ${CGoGN_EXT_LIBS})
ENDIF (WITH_QT) ENDIF (WITH_QT)
IF (WITH_GLEWMX) IF (WITH_GLEWMX)
...@@ -286,22 +286,26 @@ file( GLOB_RECURSE ...@@ -286,22 +286,26 @@ file( GLOB_RECURSE
${CGoGN_ROOT_DIR}/ThirdParty/include/*.hpp ${CGoGN_ROOT_DIR}/ThirdParty/include/*.hpp
) )
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
IF (ONELIB) IF (ONELIB)
IF(WITH_QT) IF(WITH_QT)
add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils_withQt}) add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils_withQt})
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()
add_dependencies(cgogn shader_target ) add_dependencies(cgogn shader_target)
target_link_libraries(cgogn ${CGoGN_EXT_LIBS})
ELSE() ELSE()
add_library( container ${files_container})
add_library( topology ${files_topology})
add_library( algo ${files_algo})
IF (WITH_QT) IF (WITH_QT)
add_library( utils ${files_utils_withQt} ) add_library( utils ${files_utils_withQt} )
ELSE() ELSE()
add_library( utils ${files_utils} ) add_library( utils ${files_utils} )
ENDIF() ENDIF()
add_library( container ${files_container})
add_library( topology ${files_topology})
add_library( algo ${files_algo})
add_custom_target( Geometry SOURCES ${files_geometry} ) add_custom_target( Geometry SOURCES ${files_geometry} )
add_custom_target( ThirdParty SOURCES ${files_thirdParty} ) add_custom_target( ThirdParty SOURCES ${files_thirdParty} )
add_dependencies( utils shader_target ) add_dependencies( utils shader_target )
......
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