summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-27 12:57:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-27 12:57:48 +0200
commit9ffad167a09d0f46ccbbc3aa40b507ecc96c5b41 (patch)
treee158ebc2c984ee1c0d1093b6fcf44c5bdc1466cc
parentf6468961b869dcc46e754bbfe0055e4c7b4fea9d (diff)
Oops! Some OpenGL remnants were still present.
-rw-r--r--CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bd7b261..8fa7045a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ if(NOT SDK_FACEAPI_ONLY)
endforeach()
endmacro()
- find_package(OpenGL REQUIRED)
-
if(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
add_definitions(/D FTNOIR_FILTER_BASE_LIB /D FTNOIR_TRACKER_BASE_LIB /D FTNOIR_PROTOCOL_BASE_LIB /D_CRT_SECURE_NO_WARNINGS)
else(MSVC)
@@ -317,7 +315,7 @@ endif()
target_link_libraries(ftnoir-csv ${MY_QT_LIBS})
add_library(ftnoir-pose-widget SHARED ${ftnoir-pose-widget-c} ${ftnoir-pose-widget-moc} ${ftnoir-pose-widget-rcc})
- target_link_libraries(ftnoir-pose-widget ${MY_QT_LIBS} ${OPENGL_gl_LIBRARY})
+ target_link_libraries(ftnoir-pose-widget ${MY_QT_LIBS})
add_library(ftnoir-spline-widget SHARED ${ftnoir-spline-widget-c} ${ftnoir-spline-widget-moc} ${MY_QT_LIBS} ${QT_QTDESIGNER_LIBRARY_RELEASE})
target_link_libraries(ftnoir-spline-widget ${MY_QT_LIBS})
@@ -401,7 +399,7 @@ endif()
endif()
add_library(ftnoir-tracker-ht SHARED ${ftnoir-tracker-ht-c} ${ftnoir-tracker-ht-moc} ${ftnoir-tracker-ht-uih} ${ftnoir-tracker-ht-rcc})
- target_link_libraries(ftnoir-tracker-ht ${MY_QT_LIBS} ${OPENGL_gl_LIBRARY} ftnoir-compat)
+ target_link_libraries(ftnoir-tracker-ht ${MY_QT_LIBS} ftnoir-compat)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(ftnoir-tracker-ht
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/posix-version-script.txt")
@@ -422,7 +420,7 @@ endif()
if(OpenCV_FOUND)
add_library(ftnoir-tracker-pt SHARED ${ftnoir-tracker-pt-c} ${ftnoir-tracker-pt-moc} ${ftnoir-tracker-pt-uih} ${ftnoir-tracker-pt-rcc})
- target_link_libraries(ftnoir-tracker-pt ${MY_QT_LIBS} ${OpenCV_LIBS} ${OPENGL_gl_LIBRARY})
+ target_link_libraries(ftnoir-tracker-pt ${MY_QT_LIBS} ${OpenCV_LIBS})
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(ftnoir-tracker-pt
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/posix-version-script.txt")