Skip to content
Permalink
Browse files

Update venv paths

  • Loading branch information...
geographika committed Mar 27, 2019
1 parent 4476497 commit e8bc45cae05730bffaf63a51886b99a457e85df1
Showing with 2 additions and 3 deletions.
  1. +2 −3 mapscript/python/CMakeLists.txt
@@ -64,10 +64,9 @@ else()
endif()

if(WIN32)
set(PYTHON_SCRIPTS ${OUTPUT_FOLDER}/mapscriptvenv/Scripts)
# Windows venv binaries are in a different location than Linux
set(PYTHON_VENV_SCRIPTS ${OUTPUT_FOLDER}/mapscriptvenv/Scripts)
else()
set(PYTHON_SCRIPTS ${OUTPUT_FOLDER}/mapscriptvenv/Scripts)
set(PYTHON_VENV_SCRIPTS ${OUTPUT_FOLDER}/mapscriptvenv/bin)
endif()

@@ -105,7 +104,7 @@ add_custom_command(
)

add_custom_command(
WORKING_DIRECTORY ${PYTHON_SCRIPTS} # make sure scripts aren't run when from the same folder as mapscript.py
WORKING_DIRECTORY ${PYTHON_VENV_SCRIPTS} # make sure scripts aren't run when from the same folder as mapscript.py
DEPENDS mapscriptwheel.stamp
OUTPUT mapscripttests.stamp
COMMAND ${PYTHON_VENV_SCRIPTS}/pip install --no-index --find-links=${OUTPUT_FOLDER}/dist mapscript

0 comments on commit e8bc45c

Please sign in to comment.
You can’t perform that action at this time.