Skip to content
Snippets Groups Projects
Commit 4634de48 authored by Matthias Möller's avatar Matthias Möller
Browse files

fix wrong variable names and redundant linking

Thanks to Vladimir Chalupecky for the patch

closes #2253

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19434 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 202c5e88
No related branches found
No related tags found
No related merge requests found
......@@ -157,7 +157,7 @@ if (NOT FORCE_QT4 AND QT5_FOUND)
if (QWT6_FOUND)
add_definitions(-DWITH_QWT)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${QWT6_INCLUDE_DIRS} )
set(ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${QWT6_LIBRARIES})
set(COREAPP_ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${QWT6_LIBRARIES})
endif()
else()
find_package(Qwt5)
......@@ -165,7 +165,7 @@ else()
if(Qwt5_Qt4_FOUND)
add_definitions(-DWITH_QWT)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Qwt5_INCLUDE_DIR} )
set(ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
set(COREAPP_ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
endif()
endif()
......@@ -174,9 +174,7 @@ endif()
# Linker Dependencies for Core app
# ====================================================================================
target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
${OPENMESH_CORE_LIBRARIES}
ACG
OpenFlipperPluginLib
${QT_LIBRARIES}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment