Commit 05cbfc6d authored by Davis King's avatar Davis King

Fix the CMake BUILDING_PYTHON_IN_MSVC variable not getting picked up where it should.

parent fced3587
...@@ -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()
......
...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment