diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2013-08-09 12:08:39 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2013-08-09 12:08:39 +1000 |
| commit | 940f4db42519df1105581eba9e247c0499c065b6 (patch) | |
| tree | 8f98e8157c8471e0401e22641a63a2400e5a7175 | |
| parent | 7ae5d49fc78d30c13c2c45c91cb012027c745743 (diff) | |
| parent | d2ae12cd96112e9244094c5ff9fb7197e37fb3bf (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8295d062..4a517168 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,12 +25,10 @@ file(GLOB opentrack-faceapi-wrapper-c "faceapi/*.cpp") include_directories(${CMAKE_SOURCE_DIR}) if(NOT SDK_FACEAPI_ONLY) - find_package(OpenCV REQUIRED) + find_package(OpenCV) find_package(Qt4 COMPONENTS QtCore QtGui QtDesigner QtXml QtNetwork 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) add_definitions(-DFTNOIR_FILTER_BASE_LIB -DFTNOIR_TRACKER_BASE_LIB -DFTNOIR_PROTOCOL_BASE_LIB) endif(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC) @@ -515,13 +513,9 @@ if(WIN32 AND NOT SDK_FACEAPI_ONLY) add_library(opentrack-tracker-faceapi SHARED ${opentrack-tracker-faceapi-c} ${opentrack-tracker-faceapi-moc} ${opentrack-tracker-faceapi-uih} ${opentrack-tracker-faceapi-rcc}) target_link_libraries(opentrack-tracker-faceapi ${MY_QT_LIBS} opentrack-compat) endif() -if(MSVC80 AND SDK_SM_FACEAPI_PATH) +if((MSVC80 OR MINGW) AND SDK_SM_FACEAPI_PATH) add_executable(opentrack-faceapi-wrapper ${opentrack-faceapi-wrapper-c}) - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - target_link_libraries(opentrack-faceapi-wrapper "${SDK_SM_FACEAPI_PATH}/bin/smft32.lib" "${SDK_MSVC80_PATH}/lib/msvcrt.lib") - else() - target_link_libraries(opentrack-faceapi-wrapper "${SDK_SM_FACEAPI_PATH}/bin/smft32.lib") - endif() + target_link_libraries(opentrack-faceapi-wrapper "${SDK_SM_FACEAPI_PATH}/bin/smft32.lib") endif() if(NOT SDK_FACEAPI_ONLY) |