openjpeg: bump to 2.1.2. (#816)

* Use binDir for secondary arch builds.
* Drop TEST() because it is useless without an additional data file.
* LIB_SUFFIX is not (or no longer) used so don't pass it to cmake.
* Depend on liblcms2 on all architectures where it is available.
* Add ">= 5" for the dependency on libtiff to pull the latest.
This commit is contained in:
fbrosson
2016-10-17 19:06:24 +00:00
committed by waddlesplash
parent b36e478d6f
commit dce39a06d4
2 changed files with 23 additions and 25 deletions

View File

@@ -57,7 +57,7 @@ index 5d3e288..c75a7f1 100644
install(TARGETS ${exe}
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 367a7a8..ca8d5d9 100644
index 131ed73..a64144b 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -83,7 +83,7 @@ if(WIN32)
@@ -69,15 +69,6 @@ index 367a7a8..ca8d5d9 100644
endif()
set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
@@ -114,7 +114,7 @@ endif()
# no need to install:
add_executable(t1_generate_luts t1_generate_luts.c)
if(UNIX)
- target_link_libraries(t1_generate_luts m)
+ target_link_libraries(t1_generate_luts)
endif()
# Experimental option; let's how cppcheck performs
diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
index 26bf178..5ceb7f3 100644
--- a/src/lib/openjp3d/CMakeLists.txt