|
Line
Link Here
|
| 0 |
-- cmake/Modules/FindOpenCV.cmake |
0 |
++ cmake/Modules/FindOpenCV.cmake |
|
Lines 57-69
Link Here
|
| 57 |
include(FindPkgConfig) |
57 |
include(FindPkgConfig) |
| 58 |
if(PKG_CONFIG_FOUND) |
58 |
if(PKG_CONFIG_FOUND) |
| 59 |
pkg_check_modules(OPENCV_PKGCONF opencv) |
59 |
pkg_check_modules(OPENCV_PKGCONF opencv) |
| 60 |
set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) |
60 |
# prefer pkg-config values |
| 61 |
if(EXISTS "${OpenCV_DIR}") |
61 |
if(OPENCV_PKGCONF_FOUND) |
| 62 |
set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") |
62 |
set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS}) |
| 63 |
if(EXISTS "${OpenCV_configScript_DIR}") |
63 |
set(OpenCV_FOUND true) |
| 64 |
set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") |
64 |
set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS}) |
| 65 |
endif(EXISTS "${OpenCV_configScript_DIR}") |
65 |
set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION}) |
| 66 |
endif(EXISTS "${OpenCV_DIR}") |
66 |
else(OPENCV_PKGCONF_FOUND) |
|
|
67 |
set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) |
| 68 |
if(EXISTS "${OpenCV_DIR}") |
| 69 |
set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") |
| 70 |
if(EXISTS "${OpenCV_configScript_DIR}") |
| 71 |
set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") |
| 72 |
endif(EXISTS "${OpenCV_configScript_DIR}") |
| 73 |
endif(EXISTS "${OpenCV_DIR}") |
| 74 |
endif(OPENCV_PKGCONF_FOUND) |
| 67 |
endif(PKG_CONFIG_FOUND) |
75 |
endif(PKG_CONFIG_FOUND) |
| 68 |
endif(NOT WIN32) |
76 |
endif(NOT WIN32) |
| 69 |
endif(NOT EXISTS "${OpenCV_DIR}") |
77 |
endif(NOT EXISTS "${OpenCV_DIR}") |
|
Lines 72-78
Link Here
|
| 72 |
##==================================================== |
80 |
##==================================================== |
| 73 |
## Find OpenCV libraries |
81 |
## Find OpenCV libraries |
| 74 |
##---------------------------------------------------- |
82 |
##---------------------------------------------------- |
| 75 |
if(EXISTS "${OpenCV_DIR}") |
83 |
if(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) |
| 76 |
|
84 |
|
| 77 |
#When its possible to use the Config script use it. |
85 |
#When its possible to use the Config script use it. |
| 78 |
if(EXISTS "${OpenCV_configScript}") |
86 |
if(EXISTS "${OpenCV_configScript}") |
|
Lines 257-265
Link Here
|
| 257 |
endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0) |
265 |
endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0) |
| 258 |
|
266 |
|
| 259 |
|
267 |
|
| 260 |
else(EXISTS "${OpenCV_DIR}") |
268 |
else(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) |
| 261 |
set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") |
269 |
set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") |
| 262 |
endif(EXISTS "${OpenCV_DIR}") |
270 |
endif(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) |
| 263 |
##==================================================== |
271 |
##==================================================== |
| 264 |
|
272 |
|
| 265 |
##==================================================== |
273 |
##==================================================== |
| 266 |
-- CMakeLists.txt |
274 |
++ CMakeLists.txt |
|
Lines 33-39
Link Here
|
| 33 |
|
33 |
|
| 34 |
#need to put here do setting LOCALE_DIR variable |
34 |
#need to put here do setting LOCALE_DIR variable |
| 35 |
find_package(Gettext) |
35 |
find_package(Gettext) |
| 36 |
if(Gettext_FOUND) |
36 |
if(GETTEXT_FOUND) |
| 37 |
if(NOT LOCALE_DIR) |
37 |
if(NOT LOCALE_DIR) |
| 38 |
if(WIN32) |
38 |
if(WIN32) |
| 39 |
SET(LOCALE_DIR "bin/locale") |
39 |
SET(LOCALE_DIR "bin/locale") |
|
Lines 55-61
Link Here
|
| 55 |
message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled") |
55 |
message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled") |
| 56 |
endif() |
56 |
endif() |
| 57 |
endif(NOT LOCALE_DIR) |
57 |
endif(NOT LOCALE_DIR) |
| 58 |
endif(Gettext_FOUND) |
58 |
endif(GETTEXT_FOUND) |
| 59 |
add_subdirectory(themes) |
59 |
add_subdirectory(themes) |
| 60 |
add_subdirectory(data) |
60 |
add_subdirectory(data) |
| 61 |
add_subdirectory(game) |
61 |
add_subdirectory(game) |
| 62 |
-- game/CMakeLists.txt |
62 |
++ game/CMakeLists.txt |
|
Lines 71-77
Link Here
|
| 71 |
list(APPEND LIBS ${Boost_LIBRARIES}) |
71 |
list(APPEND LIBS ${Boost_LIBRARIES}) |
| 72 |
|
72 |
|
| 73 |
# Find all the libs that don't require extra parameters |
73 |
# Find all the libs that don't require extra parameters |
| 74 |
foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png PortAudio) |
74 |
foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG PortAudio) |
| 75 |
find_package(${lib} REQUIRED) |
75 |
find_package(${lib} REQUIRED) |
| 76 |
include_directories(${${lib}_INCLUDE_DIRS}) |
76 |
include_directories(${${lib}_INCLUDE_DIRS}) |
| 77 |
list(APPEND LIBS ${${lib}_LIBRARIES}) |
77 |
list(APPEND LIBS ${${lib}_LIBRARIES}) |
|
Lines 79-85
Link Here
|
| 79 |
endforeach(lib) |
79 |
endforeach(lib) |
| 80 |
|
80 |
|
| 81 |
find_package(Gettext) |
81 |
find_package(Gettext) |
| 82 |
if(Gettext_FOUND) |
82 |
if(GETTEXT_FOUND) |
| 83 |
include_directories(${Gettext_INCLUDE_DIRS}) |
83 |
include_directories(${Gettext_INCLUDE_DIRS}) |
| 84 |
list(APPEND LIBS ${Gettext_LIBRARIES}) |
84 |
list(APPEND LIBS ${Gettext_LIBRARIES}) |
| 85 |
add_definitions("-DUSE_GETTEXT") |
85 |
add_definitions("-DUSE_GETTEXT") |
| 86 |
-- tools/CMakeLists.txt |
86 |
++ tools/CMakeLists.txt |
|
Lines 6-12
Link Here
|
| 6 |
include_directories(${Boost_INCLUDE_DIRS}) |
6 |
include_directories(${Boost_INCLUDE_DIRS}) |
| 7 |
|
7 |
|
| 8 |
# Find all the libs that don't require extra parameters |
8 |
# Find all the libs that don't require extra parameters |
| 9 |
foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype Z) |
9 |
foreach(lib LibXML++ Magick++ ZLIB JPEG TIFF PNG Freetype ZLIB) |
| 10 |
find_package(${lib}) |
10 |
find_package(${lib}) |
| 11 |
if (${lib}_FOUND) |
11 |
if (${lib}_FOUND) |
| 12 |
include_directories(${${lib}_INCLUDE_DIRS}) |
12 |
include_directories(${${lib}_INCLUDE_DIRS}) |
|
Lines 24-36
Link Here
|
| 24 |
if (LibXML++_FOUND) |
24 |
if (LibXML++_FOUND) |
| 25 |
if (Boost_FOUND) |
25 |
if (Boost_FOUND) |
| 26 |
if (Magick++_FOUND) |
26 |
if (Magick++_FOUND) |
| 27 |
if (Z_FOUND) |
27 |
if (ZLIB_FOUND) |
| 28 |
add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp) |
28 |
add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp) |
| 29 |
target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) |
29 |
target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) |
| 30 |
set(targets ${targets} ss_extract) |
30 |
set(targets ${targets} ss_extract) |
| 31 |
else (Z_FOUND) |
31 |
else (ZLIB_FOUND) |
| 32 |
message("No zlib found, not building ss_extract") |
32 |
message("No zlib found, not building ss_extract") |
| 33 |
endif (Z_FOUND) |
33 |
endif (ZLIB_FOUND) |
| 34 |
else (Magick++_FOUND) |
34 |
else (Magick++_FOUND) |
| 35 |
message("No Magick++ found, not building ss_extract") |
35 |
message("No Magick++ found, not building ss_extract") |
| 36 |
endif (Magick++_FOUND) |
36 |
endif (Magick++_FOUND) |
|
Lines 40-46
Link Here
|
| 40 |
|
40 |
|
| 41 |
if (Magick++_FOUND) |
41 |
if (Magick++_FOUND) |
| 42 |
add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp) |
42 |
add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp) |
| 43 |
target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) |
43 |
target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) |
| 44 |
set(targets ${targets} ss_cover_conv) |
44 |
set(targets ${targets} ss_cover_conv) |
| 45 |
else (Magick++_FOUND) |
45 |
else (Magick++_FOUND) |
| 46 |
message("No Magick++ found, not building ss_cover_conv") |
46 |
message("No Magick++ found, not building ss_cover_conv") |
|
Lines 58-70
Link Here
|
| 58 |
target_link_libraries(ss_archive_extract ${Boost_LIBRARIES}) |
58 |
target_link_libraries(ss_archive_extract ${Boost_LIBRARIES}) |
| 59 |
set(targets ${targets} ss_archive_extract) |
59 |
set(targets ${targets} ss_archive_extract) |
| 60 |
|
60 |
|
| 61 |
if (Z_FOUND) |
61 |
if (ZLIB_FOUND) |
| 62 |
add_executable(itg_pck itg_pck.cc) |
62 |
add_executable(itg_pck itg_pck.cc) |
| 63 |
target_link_libraries(itg_pck ${Boost_LIBRARIES} ${Z_LIBRARIES}) |
63 |
target_link_libraries(itg_pck ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) |
| 64 |
set(targets ${targets} itg_pck) |
64 |
set(targets ${targets} itg_pck) |
| 65 |
|
65 |
|
| 66 |
add_executable(ss_chc_decode ss_chc_decode.cpp) |
66 |
add_executable(ss_chc_decode ss_chc_decode.cpp) |
| 67 |
target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${Z_LIBRARIES}) |
67 |
target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) |
| 68 |
set(targets ${targets} ss_chc_decode) |
68 |
set(targets ${targets} ss_chc_decode) |
| 69 |
endif() |
69 |
endif() |
| 70 |
endif (Boost_FOUND) |
70 |
endif (Boost_FOUND) |
