Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake hacks for windows #68

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

cmake hacks for windows #68

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f6d0c7
temporary preview
hfmanson Feb 21, 2019
9d04830
merge conflict
hfmanson Feb 28, 2019
2312d6c
python path fix, python interpreter fix
hfmanson Feb 28, 2019
2cbd3b1
windows test
hfmanson Feb 28, 2019
70cbe3c
don't re-find python interpreter when PYTHON_FOUND is set
hfmanson Mar 6, 2019
8a6197a
import library
hfmanson Mar 13, 2019
2b22db1
python fixes
hfmanson Apr 15, 2020
0141aa8
Merge branch 'master' of https://github.com/hfmanson/quick-der
hfmanson Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions cmake/PythonSupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# is Windows. Here, we need it while building, regardless of target,
# on a Windows host.
if (CMAKE_HOST_SYSTEM MATCHES "Windows")
set (PYTHON_PATH_SEPARATOR ";")
set (PYTHON_PATH_SEPARATOR "\\\;")
else()
set (PYTHON_PATH_SEPARATOR ":")
endif()
Expand Down Expand Up @@ -46,21 +46,21 @@ endfunction()
macro (FindPythonInterpreter)
if (NOT PYTHON_FOUND)
message (STATUS "Looking for Python")
endif()
if ( CMAKE_VERSION VERSION_GREATER 3.12 )
find_package (Python)
if (NOT Python_Interpreter_FOUND )
message (FATAL_ERROR "No Python interpreter found")
else()
set (PYTHON_EXECUTABLE ${Python_EXECUTABLE})
endif()
set (PYTHON_FOUND ${Python_Interpreter_FOUND})
else()
# set( Python_ADDITIONAL_VERSIONS "3" "3.5" "3.6" "3.7" )
find_package (PythonInterp)
if (NOT PYTHONINTERP_FOUND)
message (FATAL_ERROR "No Python interpreter found.")
endif()
set (PYTHON_FOUND ${PYTHONINTERP_FOUND})
if ( CMAKE_VERSION VERSION_GREATER 3.12 )
find_package (Python)
if (NOT Python_Interpreter_FOUND )
message (FATAL_ERROR "No Python interpreter found")
else()
set (PYTHON_EXECUTABLE ${Python_EXECUTABLE})
endif()
set (PYTHON_FOUND ${Python_Interpreter_FOUND})
else()
# set( Python_ADDITIONAL_VERSIONS "3" "3.5" "3.6" "3.7" )
find_package (PythonInterp)
if (NOT PYTHONINTERP_FOUND)
message (FATAL_ERROR "No Python interpreter found.")
endif()
set (PYTHON_FOUND ${PYTHONINTERP_FOUND})
endif()
endif()
endmacro()