Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
05cbfc6d
Commit
05cbfc6d
authored
Jul 27, 2019
by
Davis King
Browse files
Fix the CMake BUILDING_PYTHON_IN_MSVC variable not getting picked up where it should.
parent
fced3587
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
dlib/cmake_utils/find_libjpeg.cmake
dlib/cmake_utils/find_libjpeg.cmake
+6
-0
dlib/cmake_utils/find_libpng.cmake
dlib/cmake_utils/find_libpng.cmake
+6
-0
No files found.
dlib/cmake_utils/find_libjpeg.cmake
View file @
05cbfc6d
...
@@ -3,6 +3,12 @@
...
@@ -3,6 +3,12 @@
cmake_minimum_required
(
VERSION 2.8.12
)
cmake_minimum_required
(
VERSION 2.8.12
)
if
(
BUILDING_PYTHON_IN_MSVC
)
# Never use any system copy of libjpeg when building python in visual studio
set
(
JPEG_FOUND 0
)
return
()
endif
()
# Don't rerun this script if its already been executed.
# Don't rerun this script if its already been executed.
if
(
DEFINED JPEG_FOUND
)
if
(
DEFINED JPEG_FOUND
)
return
()
return
()
...
...
dlib/cmake_utils/find_libpng.cmake
View file @
05cbfc6d
...
@@ -3,6 +3,12 @@
...
@@ -3,6 +3,12 @@
cmake_minimum_required
(
VERSION 2.8.12
)
cmake_minimum_required
(
VERSION 2.8.12
)
if
(
BUILDING_PYTHON_IN_MSVC
)
# Never use any system copy of libpng when building python in visual studio
set
(
PNG_FOUND 0
)
return
()
endif
()
# Don't rerun this script if its already been executed.
# Don't rerun this script if its already been executed.
if
(
DEFINED PNG_FOUND
)
if
(
DEFINED PNG_FOUND
)
return
()
return
()
...
...
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