walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #572 from mayeut/master 

Correct CMake version requirements
This commit is contained in:
Matthieu Darbois 2015-09-01 20:53:25 +02:00
parent 2eb97a851d c5dd6035c9
commit 15d07f33d1
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/openjp2/CMakeLists.txt
View File

@ -85,7 +85,9 @@ if(UNIX)
target_link_libraries(${OPENJPEG_LIBRARY_NAME} m) target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
endif() endif()
set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
endif()
# Install library # Install library
install(TARGETS ${OPENJPEG_LIBRARY_NAME} install(TARGETS ${OPENJPEG_LIBRARY_NAME}

2
src/lib/openjp3d/CMakeLists.txt
View File

@ -27,7 +27,9 @@ if(UNIX)
target_link_libraries(${OPENJP3D_LIBRARY_NAME} m) target_link_libraries(${OPENJP3D_LIBRARY_NAME} m)
endif() endif()
set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
target_compile_options(${OPENJP3D_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) target_compile_options(${OPENJP3D_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
endif()
# Install library # Install library
install(TARGETS ${OPENJP3D_LIBRARY_NAME} install(TARGETS ${OPENJP3D_LIBRARY_NAME}

2
src/lib/openjpip/CMakeLists.txt
View File

@ -61,7 +61,9 @@ endif()
add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS})
set_target_properties(openjpip set_target_properties(openjpip
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
endif()
target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME}) target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
if(WIN32) if(WIN32)
# add Winsock on windows+mingw # add Winsock on windows+mingw

2
src/lib/openjpwl/CMakeLists.txt
View File

@ -51,7 +51,9 @@ if(UNIX)
endif() endif()
set_target_properties(openjpwl set_target_properties(openjpwl
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
endif()
# Install library # Install library
install(TARGETS openjpwl install(TARGETS openjpwl

2
src/lib/openmj2/CMakeLists.txt
View File

@ -46,7 +46,9 @@ if(UNIX)
target_link_libraries(${OPENMJ2_LIBRARY_NAME} m) target_link_libraries(${OPENMJ2_LIBRARY_NAME} m)
endif() endif()
set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
endif()
# Install library # Install library
install(TARGETS ${OPENMJ2_LIBRARY_NAME} install(TARGETS ${OPENMJ2_LIBRARY_NAME}

2
tests/nonregression/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression # NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
cmake_minimum_required(VERSION 2.8.7)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
set(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary) set(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary)