Skip to content

Commit

Permalink
Tried to remove all hardcoded python paths from the code.
Browse files Browse the repository at this point in the history
This is to make it possible to build/use VDT with Python *not* installed
under /usr/bin.
  • Loading branch information
krasznaa committed Oct 23, 2018
1 parent 330ca75 commit 266c2eb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Auto generate the code for the vector signatures and if needed preload

# We need Python for the following.
find_package (PythonInterp REQUIRED)

# Generate the code for the lib
if (PRELOAD)
set (SIGGENOPTS " -p")
else()
set (SIGGENOPTS " ")
endif()
EXEC_PROGRAM ("cd src;python ${CMAKE_SOURCE_DIR}/src/signatures_generator.py ${SIGGENOPTS} -o ${CMAKE_SOURCE_DIR}/src;cd -")
EXEC_PROGRAM ("cd src;${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/signatures_generator.py ${SIGGENOPTS} -o ${CMAKE_SOURCE_DIR}/src;cd -")

#generare Vc wrapper and config file
if(USE_VC)
EXEC_PROGRAM ("cd src;python vc_wrapper_generator.py;cd -")
EXEC_PROGRAM ("cd src;${PYTHON_EXECUTABLE} vc_wrapper_generator.py;cd -")
endif(USE_VC)
configure_file( ${INC_DIR}/externalLibcfg.h.cmake ${INC_DIR}/externalLibcfg.h)
2 changes: 1 addition & 1 deletion src/numpy_wrapper_generator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#!/usr/bin/env python

"""
Generates numpy wrapper - both header and .cc file
Expand Down
2 changes: 1 addition & 1 deletion src/vc_wrapper_generator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#!/usr/bin/env python

"""
Generates vc wrapper - both header and .cc file
Expand Down

0 comments on commit 266c2eb

Please sign in to comment.