Created
September 16, 2016 21:36
-
-
Save bfolkens/7857d8397ab560fca121b71cc7593174 to your computer and use it in GitHub Desktop.
Patch python/CMakeLists.txt to see correct version of python in multi py install with fblualib
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- python/CMakeLists.txt.old 2016-09-16 21:33:29.181708736 +0000 | |
+++ python/CMakeLists.txt 2016-09-16 21:33:50.121273080 +0000 | |
@@ -26,7 +26,6 @@ | |
FIND_PACKAGE(THPP REQUIRED) | |
FIND_PACKAGE(FBLuaLib REQUIRED) | |
FIND_PACKAGE(PythonLibs REQUIRED) | |
-FIND_PACKAGE(NumPy REQUIRED) | |
if (${PYTHONLIBS_VERSION_STRING} GREATER "3" ) | |
message(STATUS "Found Python version > 3, linking against 2.7") | |
@@ -34,6 +33,9 @@ | |
string(REGEX REPLACE "3\\.[0-9][a-z]*" "2.7" PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}) | |
endif (${PYTHONLIBS_VERSION_STRING} GREATER "3" ) | |
+SET(PYTHON_EXECUTABLE /usr/bin/python) | |
+FIND_PACKAGE(NumPy REQUIRED) | |
+ | |
INCLUDE_DIRECTORIES( | |
${FOLLY_INCLUDE_DIR} | |
${GLOG_INCLUDE_DIR} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment