Merge pull request python-cmake-buildsystem#189 from msmolens/fix-apply-patches-external-source

jcfr · web-flow · commit 849e5968b9f7 · 2017-08-02T13:13:48.000-04:00
Fix applying patches when external source is provided
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -235,12 +235,6 @@ If you already downloaded the source, you could try to re-configure this project
 endif()
 message(STATUS "SRC_DIR: ${SRC_DIR}")
 
-# Apply patches
-option(PYTHON_APPLY_PATCHES "Apply patches" ON)
-if(PYTHON_APPLY_PATCHES)
-  include(cmake/PythonApplyPatches.cmake)
-endif()
-
 # Extract version from python source (Copied from FindPythonLibs.cmake)
 file(STRINGS "${SRC_DIR}/Include/patchlevel.h" python_version_str
     REGEX "^#define[ \t]+PY_VERSION[ \t]+\"[^\"]+\"")
@@ -258,6 +252,12 @@ if(NOT DEFINED _download_${PY_VERSION}_md5)
     message(FATAL_ERROR "error: unknown python version '${PY_VERSION}'. Valid version should match '2.7.[3-13]' or '3.5.[1-2]'")
 endif()
 
+# Apply patches
+option(PYTHON_APPLY_PATCHES "Apply patches" ON)
+if(PYTHON_APPLY_PATCHES)
+  include(cmake/PythonApplyPatches.cmake)
+endif()
+
 # Convenience boolean variables to easily test python version
 set(IS_PY3 0)
 set(IS_PY2 1)
