This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via a4add4eca2a19b52c44b6cbf074f99788e63d04e (commit)
via a848abe24cd9cf05b9ffc9141d3f4a3ea633c056 (commit)
via f5c46dd84ec48cfd1bfe32ed0093a21321e89845 (commit)
via 1c4c4be509ab548d9e848a8850c30e3dbbb7f8bc (commit)
from 4193430628757eb664f65bb1810ce5077f68e2b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4add4eca2a19b52c44b6cbf074f99788e63d04e
commit a4add4eca2a19b52c44b6cbf074f99788e63d04e
Merge: a848abe f5c46dd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 8 12:31:14 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Nov 8 07:31:30 2018 -0500
Merge topic 'pkgconfig-mark-advanced'
f5c46dd84e PkgConfig: Be less verbose by mark(ing)_as_advanced the
find_library result
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Rolf Eike Beer <e...@sf-mail.de>
Merge-request: !2576
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a848abe24cd9cf05b9ffc9141d3f4a3ea633c056
commit a848abe24cd9cf05b9ffc9141d3f4a3ea633c056
Merge: 4193430 1c4c4be
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 8 12:30:41 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Nov 8 07:30:51 2018 -0500
Merge topic 'find-jpeg-turbo-multiarch-version'
1c4c4be509 FindJPEG: handle multiarch installs of libjpeg-turbo
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2572
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5c46dd84ec48cfd1bfe32ed0093a21321e89845
commit f5c46dd84ec48cfd1bfe32ed0093a21321e89845
Author: Sylvain Joubert <joubert...@gmail.com>
AuthorDate: Wed Nov 7 11:07:32 2018 +0100
Commit: Sylvain Joubert <joubert...@gmail.com>
CommitDate: Wed Nov 7 14:08:02 2018 +0100
PkgConfig: Be less verbose by mark(ing)_as_advanced the find_library result
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index a45aef2..e192426 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -231,6 +231,7 @@ function(_pkg_find_libs _prefix _no_cmake_path
_no_cmake_environment_path)
find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
NAMES ${_pkg_search}
${_find_opts})
+ mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
endforeach()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4c4be509ab548d9e848a8850c30e3dbbb7f8bc
commit 1c4c4be509ab548d9e848a8850c30e3dbbb7f8bc
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Nov 6 13:20:36 2018 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Nov 6 16:45:52 2018 -0500
FindJPEG: handle multiarch installs of libjpeg-turbo
Fedora installs a `jconfig-32.h` and `jconfig-64.h` which were not
searched. Instead, glob up all `jconfig` headers and bail once we've
found a version number.
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 0aa387a..f50f79e 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -67,23 +67,33 @@ endif()
unset(jpeg_names)
unset(jpeg_names_debug)
-if(JPEG_INCLUDE_DIR AND EXISTS "${JPEG_INCLUDE_DIR}/jpeglib.h")
- file(STRINGS "${JPEG_INCLUDE_DIR}/jpeglib.h"
- jpeg_lib_version REGEX "^#define[\t ]+JPEG_LIB_VERSION[\t ]+.*")
-
- if (NOT jpeg_lib_version)
- # libjpeg-turbo sticks JPEG_LIB_VERSION in jconfig.h
- find_path(jconfig_dir jconfig.h)
- if (jconfig_dir)
- file(STRINGS "${jconfig_dir}/jconfig.h"
- jpeg_lib_version REGEX "^#define[\t ]+JPEG_LIB_VERSION[\t ]+.*")
- endif()
- unset(jconfig_dir)
- endif()
-
- string(REGEX REPLACE "^#define[\t ]+JPEG_LIB_VERSION[\t ]+([0-9]+).*"
- "\\1" JPEG_VERSION "${jpeg_lib_version}")
+if(JPEG_INCLUDE_DIR)
+ file(GLOB _JPEG_CONFIG_HEADERS_FEDORA "${JPEG_INCLUDE_DIR}/jconfig*.h")
+ file(GLOB _JPEG_CONFIG_HEADERS_DEBIAN "${JPEG_INCLUDE_DIR}/*/jconfig.h")
+ set(_JPEG_CONFIG_HEADERS
+ "${JPEG_INCLUDE_DIR}/jpeglib.h"
+ ${_JPEG_CONFIG_HEADERS_FEDORA}
+ ${_JPEG_CONFIG_HEADERS_DEBIAN})
+ foreach (_JPEG_CONFIG_HEADER IN LISTS _JPEG_CONFIG_HEADERS)
+ if (NOT EXISTS "${_JPEG_CONFIG_HEADER}")
+ continue ()
+ endif ()
+ file(STRINGS "${_JPEG_CONFIG_HEADER}"
+ jpeg_lib_version REGEX "^#define[\t ]+JPEG_LIB_VERSION[\t ]+.*")
+
+ if (NOT jpeg_lib_version)
+ continue ()
+ endif ()
+
+ string(REGEX REPLACE "^#define[\t ]+JPEG_LIB_VERSION[\t ]+([0-9]+).*"
+ "\\1" JPEG_VERSION "${jpeg_lib_version}")
+ break ()
+ endforeach ()
unset(jpeg_lib_version)
+ unset(_JPEG_CONFIG_HEADER)
+ unset(_JPEG_CONFIG_HEADERS)
+ unset(_JPEG_CONFIG_HEADERS_FEDORA)
+ unset(_JPEG_CONFIG_HEADERS_DEBIAN)
endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
diff --git a/Tests/FindJPEG/Test/CMakeLists.txt
b/Tests/FindJPEG/Test/CMakeLists.txt
index a744f85..912c7a1 100644
--- a/Tests/FindJPEG/Test/CMakeLists.txt
+++ b/Tests/FindJPEG/Test/CMakeLists.txt
@@ -4,6 +4,8 @@ include(CTest)
find_package(JPEG)
+add_definitions(-DCMAKE_EXPECTED_JPEG_VERSION=${JPEG_VERSION})
+
add_executable(test_jpeg_tgt main.c)
target_link_libraries(test_jpeg_tgt JPEG::JPEG)
add_test(NAME test_jpeg_tgt COMMAND test_jpeg_tgt)
diff --git a/Tests/FindJPEG/Test/main.c b/Tests/FindJPEG/Test/main.c
index c6e48f0..0e23eff 100644
--- a/Tests/FindJPEG/Test/main.c
+++ b/Tests/FindJPEG/Test/main.c
@@ -12,5 +12,5 @@ int main()
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo);
- return 0;
+ return (JPEG_LIB_VERSION != CMAKE_EXPECTED_JPEG_VERSION);
}
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJPEG.cmake | 42 +++++++++++++++++++++++---------------
Modules/FindPkgConfig.cmake | 1 +
Tests/FindJPEG/Test/CMakeLists.txt | 2 ++
Tests/FindJPEG/Test/main.c | 2 +-
4 files changed, 30 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
