View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

FindJPEG.cmake.patch [^] (1,238 bytes) 2013-12-12 07:24 [Show Content] [Hide Content]

diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 90e4485..fdeb85a 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -4,7 +4,15 @@
 #
 # Find JPEG
 #
-# Find the native JPEG includes and library This module defines
+# Find the native JPEG includes and library.
+#
+# This modules can be configured with
+#
+# ::
+#
+#   JPEG_ROOT_DIR, a path pointing to a nonstandard jpeg installation.
+#
+# This module defines
 #
 # ::
 #
@@ -31,10 +39,20 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_path(JPEG_INCLUDE_DIR jpeglib.h)
+# Search JPEG_ROOT first if it is set.
+if(JPEG_ROOT)
+  set(_JPEG_SEARCH_ROOT PATHS ${JPEG_ROOT} NO_DEFAULT_PATH)
+  list(APPEND _JPEG_SEARCHES _JPEG_SEARCH_ROOT)
+endif()
 
 set(JPEG_NAMES ${JPEG_NAMES} jpeg)
-find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} )
+
+foreach(search ${_JPEG_SEARCHES})
+  find_path(JPEG_INCLUDE_DIR jpeglib.h ${${search}} PATH_SUFFIXES include)
+  find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} ${${search}} PATH_SUFFIXES include)
+endforeach()
+
+unset(_JPEG_SEARCHES)
 
 # handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if
 # all listed variables are TRUE

FindJPEG.cmake.1.patch [^] (1,250 bytes) 2013-12-12 07:29 [Show Content] [Hide Content]

diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 90e4485..8457f1e 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -4,7 +4,15 @@
 #
 # Find JPEG
 #
-# Find the native JPEG includes and library This module defines
+# Find the native JPEG includes and library.
+#
+# This modules can be configured with
+#
+# ::
+#
+#   JPEG_ROOT_DIR, a path pointing to a nonstandard jpeg installation.
+#
+# This module defines
 #
 # ::
 #
@@ -31,10 +39,20 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_path(JPEG_INCLUDE_DIR jpeglib.h)
+# Search JPEG_ROOT_DIR first if it is set.
+if(JPEG_ROOT_DIR)
+  set(_JPEG_SEARCH_ROOT PATHS ${JPEG_ROOT_DIR} NO_DEFAULT_PATH)
+  list(APPEND _JPEG_SEARCHES _JPEG_SEARCH_ROOT)
+endif()
 
 set(JPEG_NAMES ${JPEG_NAMES} jpeg)
-find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} )
+
+foreach(search ${_JPEG_SEARCHES})
+  find_path(JPEG_INCLUDE_DIR jpeglib.h ${${search}} PATH_SUFFIXES include)
+  find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} ${${search}} PATH_SUFFIXES include)
+endforeach()
+
+unset(_JPEG_SEARCHES)
 
 # handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if
 # all listed variables are TRUE

Relationships

Notes
(0034770) Marcel Metz (reporter) 2013-12-12 07:30	My bad, the first patch contained a typo.

(0034777) Rolf Eike Beer (developer) 2013-12-16 04:08	I wonder if this patch gives any benefits against simply setting CMAKE_PREFIX_PATH from the command line. I think the documentation of the _ROOT_DIR should be changed so it states that if you ever need such a variable it should be called _ROOT_DIR, but in general one should avoid introducing one and should look if setting CMAKE_PREFIX_PATH isn't working.

(0034778) Marcel Metz (reporter) 2013-12-16 04:52	> I wonder if this patch gives any benefits against simply setting CMAKE_PREFIX_PATH from the command line. As far as I know it isn't possible to set up the CMAKE_PREFIX_PATH within a CMakeLists.txt file. You are forced to set it on the command line or as an environment variable.

(0034779) Rolf Eike Beer (developer) 2013-12-16 04:56	Since you can't know the layout of the users system in advance setting anything like that environment variable from with a CMakeLists.txt is wrong anyway.

(0034780) Marcel Metz (reporter) 2013-12-16 05:09 edited on: 2014-02-17 14:39	In my case the layout of the user system is known. The jpeg library (and other libraries) are bundled in a development toolkit (I'm unable to change that) which should be dropped in a certain subdirectory of my CMake base project. But I'm open for other ideas how to fix that. I could also just use the patched FindJPEG in the private project cmake module path, but I thought this patch is maybe useful for the upstream project too.

(0042446) Kitware Robot (administrator) 2016-06-10 14:29	Resolving issue as `moved`. This issue tracker is no longer used. Further discussion of this issue may take place in the current CMake Issues page linked in the banner at the top of this page.

Issue History
Date Modified	Username	Field	Change
2013-12-12 07:24	Marcel Metz	New Issue
2013-12-12 07:24	Marcel Metz	File Added: FindJPEG.cmake.patch
2013-12-12 07:29	Marcel Metz	File Added: FindJPEG.cmake.1.patch
2013-12-12 07:30	Marcel Metz	Note Added: 0034770
2013-12-16 04:08	Rolf Eike Beer	Note Added: 0034777
2013-12-16 04:52	Marcel Metz	Note Added: 0034778
2013-12-16 04:56	Rolf Eike Beer	Note Added: 0034779
2013-12-16 05:09	Marcel Metz	Note Added: 0034780
2014-02-17 14:39	Marcel Metz	Note Edited: 0034780
2016-06-10 14:29	Kitware Robot	Note Added: 0042446
2016-06-10 14:29	Kitware Robot	Status	new => resolved
2016-06-10 14:29	Kitware Robot	Resolution	open => moved
2016-06-10 14:29	Kitware Robot	Assigned To	=> Kitware Robot
2016-06-10 14:31	Kitware Robot	Status	resolved => closed