From 7d3478a9931763400f44c15165f55e9ae904e5a0 Mon Sep 17 00:00:00 2001 From: mzn Date: Mon, 20 Aug 2018 14:18:24 +0300 Subject: [PATCH] Fix checking of environment variable. --- CMakeCommon/FindPython.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake index e48b6c206..c38d22127 100644 --- a/CMakeCommon/FindPython.cmake +++ b/CMakeCommon/FindPython.cmake @@ -5,15 +5,15 @@ UNSET(PYTHON_LIBRARIES) IF(WIN32) IF(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(PYTHON_LIBRARY_FILE "python27_d.lib") + SET(PYTHON_LIBRARY_FILE "python36_d.lib") ElSE() - SET(PYTHON_LIBRARY_FILE "python27.lib") + SET(PYTHON_LIBRARY_FILE "python36.lib") ENDIF() ElSE() - SET(PYTHON_LIBRARY_FILE "libpython2.7.so") + SET(PYTHON_LIBRARY_FILE "libpython3.6.so") ENDIF() -IF($ENV{PYTHONHOME}) +IF(DEFINED ENV{PYTHONHOME}) IF(WIN32) FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/libs/${PYTHON_LIBRARY_FILE}" PATH_PYTHON_LIBRARY) ElSE() @@ -22,12 +22,12 @@ IF($ENV{PYTHONHOME}) SET(PYTHON_LIBRARY ${PATH_PYTHON_LIBRARY} CACHE FILEPATH "path to the python library" FORCE) ENDIF() -IF($ENV{PYTHON_INCLUDE}) +IF(DEFINED ENV{PYTHON_INCLUDE}) FILE(TO_CMAKE_PATH $ENV{PYTHON_INCLUDE} PATH_PYTHON_INCLUDE_DIR) SET(PYTHON_INCLUDE_DIR ${PATH_PYTHON_INCLUDE_DIR} CACHE PATH "path to where Python.h is found" FORCE) ENDIF() -FIND_PACKAGE(PythonLibs REQUIRED) FIND_PACKAGE(PythonInterp REQUIRED) +FIND_PACKAGE(PythonLibs REQUIRED) -INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR}) \ No newline at end of file -- 2.39.2