anaconda, no goal expansion within call
This commit is contained in:
@@ -9,7 +9,9 @@ set (Python_ADDITIONAL_VERSIONS 3.7 3.6 ) #3.5 3.6 3.4 )
|
||||
# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake 2.8.8)
|
||||
##
|
||||
#
|
||||
if (WIN320)
|
||||
|
||||
# ensure the script is in your cmake module path
|
||||
if (WIN32)
|
||||
set (PYTHONLIBS_FOUND YES CACHE BOOL "MINGW/MSYS2" FORCE )
|
||||
set (PYTHON_LIBRARY C:/msys64/mingw64/lib/libpython3.6m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
|
||||
set (PYTHON_LIBRARIES C:/msys64/mingw64/lib/libpython3.5m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
|
||||
@@ -18,21 +20,25 @@ if (WIN320)
|
||||
set (PYTHON_EXECUTABLE C:/msys64/mingw64/bin/python3.exe CACHE FILEPATH "MINGW/MSYS2" FORCE )
|
||||
set (PYTHONLIBS_VERSION_STRING 3.5 CACHE STRING "MINGW/MSYS2" FORCE )
|
||||
|
||||
elseif ($ENV{CONDA_BUILD}x STREQUAL "1x")
|
||||
|
||||
|
||||
set (PYTHONLIBS_FOUND YES CACHE BOOL "MINGW/MSYS2" FORCE )
|
||||
set( PYTHON_EXECUTABLE $ENV{PYTHON} CACHE FILEPATH "MINGW/MSYS2" FORCE )
|
||||
set( PYTHON_LIBRARIES $ENV{PYTHON_LIBRARIES} CACHE FILEPATH "MINGW/MSYS2" FORCE )
|
||||
set( PYTHON_INCLUDE_PATH $ENV{PYTHON_INCLUDE_DIRS} CACHE PATH "MINGW/MSYS2" FORCE )
|
||||
set( PYTHON_INCLUDE_DIRS $ENV{PYTHON_INCLUDE_DIRS} CACHE PATH "MINGW/MSYS2" FORCE )
|
||||
set (PYTHONLIBS_VERSION_STRING $ENV{PY_VER} CACHE STRING "MINGW/MSYS2" FORCE )
|
||||
list (APPEND CMAKE_REQUIRED_INCLUDES
|
||||
${PYTHON_INCLUDE_PATH})
|
||||
|
||||
else()
|
||||
find_package(PythonInterp)
|
||||
|
||||
find_package(PythonLibs)
|
||||
|
||||
|
||||
endif()
|
||||
|
||||
include_directories( BEFORE ${PYTHON_INCLUDE_DIRS} )
|
||||
|
||||
LIST( APPEND
|
||||
CMAKE_REQUIRED_INCLUDES ${PYTHON_INCLUDE_DIRS} ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIRS})
|
||||
|
||||
check_include_file(Python.h HAVE_PYTHON_H)
|
||||
|
||||
IF (PYTHONLIBS_FOUND)
|
||||
add_subDIRECTORY (packages/python)
|
||||
ENDIF()
|
||||
ENDIF()
|
Reference in New Issue
Block a user