Lines 1-42
Link Here
|
1 |
--- ./CMakeLists.txt.orig 2013-12-02 09:23:52.000000000 -0500 |
|
|
2 |
+++ ./CMakeLists.txt 2013-12-02 09:25:24.000000000 -0500 |
3 |
@@ -208,19 +178,12 @@ |
4 |
endif() |
5 |
|
6 |
# OpenCV |
7 |
- SET(OpenCV_LIBS "") |
8 |
- if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux with old old opencv systems |
9 |
- pkg_check_modules(OpenCV opencv>=2.1.0) |
10 |
- SET(OpenCV_LIBS ${OpenCV_LIBRARIES}) |
11 |
- endif(PKG_CONFIG_FOUND) |
12 |
- IF (OpenCV_LIBS STREQUAL "") |
13 |
- find_package(OpenCV 2.1.0 REQUIRED core imgproc) |
14 |
- ENDIF() |
15 |
+ find_package(OpenCVCore COMPONENTS core imgproc REQUIRED) |
16 |
IF (OpenCV_VERSION VERSION_LESS 2.4.0 AND OpenCV_FOUND AND MSVC) # OpenCV didn't allow to define packages before version 2.4.0 ... nomacs was linking against all libs even if they were not compiled -> error |
17 |
string(REGEX REPLACE "\\." "" OpenCV_SHORT_VERSION ${OpenCV_VERSION}) |
18 |
SET(OpenCV_LIBS "debug;opencv_imgproc${OpenCV_SHORT_VERSION}d;optimized;opencv_imgproc${OpenCV_SHORT_VERSION};debug;opencv_core${OpenCV_SHORT_VERSION}d;optimized;opencv_core${OpenCV_SHORT_VERSION};") |
19 |
ENDIF() |
20 |
- IF (NOT OpenCV_FOUND) |
21 |
+ IF (NOT OPENCVCORE_FOUND) |
22 |
message(FATAL_ERROR "OpenCV not found. It's mandatory when used with ENABLE_RAW enabled") |
23 |
ELSE() |
24 |
add_definitions(-DWITH_OPENCV) |
25 |
@@ -285,6 +243,8 @@ |
26 |
|
27 |
ENDIF(ENABLE_TIFF) |
28 |
|
29 |
+# sysinfo library |
30 |
+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo) |
31 |
|
32 |
include_directories ( |
33 |
${QT_INCLUDES} |
34 |
@@ -427,7 +387,7 @@ |
35 |
set(EXE_NAME ${CMAKE_PROJECT_NAME}) |
36 |
link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS}) |
37 |
add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE}) |
38 |
- target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES}) |
39 |
+ target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY}) |
40 |
|
41 |
IF (CMAKE_SYSTEM_NAME MATCHES "Linux") |
42 |
SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp) |