Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
5dc9f440
Commit
5dc9f440
authored
Jun 21, 2018
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'FindJPEG-fix-debug' into release-3.12
Merge-request:
!2159
parents
ecbaed7a
ae4a5483
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
Modules/FindJPEG.cmake
Modules/FindJPEG.cmake
+1
-7
No files found.
Modules/FindJPEG.cmake
View file @
5dc9f440
...
...
@@ -52,7 +52,7 @@
find_path
(
JPEG_INCLUDE_DIR jpeglib.h
)
set
(
jpeg_names
${
JPEG_NAMES
}
jpeg jpeg-static libjpeg libjpeg-static
)
foreach
(
name
${
JPEG_NAMES
}
)
foreach
(
name
${
jpeg_names
}
)
list
(
APPEND jpeg_names_debug
"
${
name
}
d"
)
endforeach
()
...
...
@@ -122,10 +122,4 @@ if(JPEG_FOUND)
endif
()
endif
()
# Deprecated declarations.
set
(
NATIVE_JPEG_INCLUDE_PATH
${
JPEG_INCLUDE_DIR
}
)
if
(
JPEG_LIBRARY
)
get_filename_component
(
NATIVE_JPEG_LIB_PATH
${
JPEG_LIBRARY
}
PATH
)
endif
()
mark_as_advanced
(
JPEG_LIBRARY JPEG_INCLUDE_DIR
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment