8b724434c3
Since libwebp was switched to CMake, the .la files that told static
builds which libraries had to be linked with libwebp are no longer
generated, breaking static builds. By switching libtiff to CMake too,
we can use the CMake files instead. (This is necessary, but not
sufficient, for static builds to work — a further patch is required.)
This was tried once before (in 96d50327bc59 ("libtiff: export private
headers for freeimage")), and I reverted it (in
5df9305b60d5 ("libtiff: fix cross by switching back to autoconf")),
because at the time, it broke cross compilation of libtiff. Things
seem to have settled since then, and this now cross compiles
correctly.
Fixes: 909c49149371 ("libwebp: build with CMake")
14 lines
676 B
Diff
14 lines
676 B
Diff
diff --git a/cmake/AutotoolsVersion.cmake b/cmake/AutotoolsVersion.cmake
|
|
index f93f5cf0..fd33df59 100644
|
|
--- a/cmake/AutotoolsVersion.cmake
|
|
+++ b/cmake/AutotoolsVersion.cmake
|
|
@@ -41,7 +41,7 @@ set(LIBTIFF_VERSION "${LIBTIFF_MAJOR_VERSION}.${LIBTIFF_MINOR_VERSION}.${LIBTIFF
|
|
set(LIBTIFF_VERSION_FULL "${LIBTIFF_VERSION}${LIBTIFF_ALPHA_VERSION}")
|
|
|
|
# Get release version from file VERSION
|
|
-FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" LIBTIFF_RELEASE_VERSION)
|
|
+FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt" LIBTIFF_RELEASE_VERSION)
|
|
|
|
# Package date - get it from file RELEASE-DATE
|
|
FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE-DATE" LIBTIFF_RELEASE_DATE)
|