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

Fix python dest #106

Closed
wants to merge 8 commits into from
Closed

Fix python dest #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c2bd46
first working conda recipe
paskino Apr 5, 2018
a283c0c
use PYTHON_DEST to point to the site_packages
paskino Apr 10, 2018
7dbd1c8
do not overwrite the PYTHON_DEST?
paskino Apr 10, 2018
1585c6d
removed messages
paskino Apr 11, 2018
d2e1615
updated about, removed SIRF_VERSION env var
paskino Apr 11, 2018
cd54fe9
pulls the 1.0.0 tag
paskino Apr 11, 2018
234ab0e
removed SIRF_VERSION env var
paskino Apr 11, 2018
e3fc370
removed conda recipe for this PR
paskino Apr 11, 2018
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
5 changes: 4 additions & 1 deletion SuperBuild/External_SIRF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr

set (BUILD_PYTHON ${PYTHONLIBS_FOUND})
if (BUILD_PYTHON)
set(PYTHON_DEST "${SIRF_Install_Dir}/python" CACHE PATH "Destination for python modules")
if (PYTHON_DEST)
else()
set(PYTHON_DEST "${SIRF_Install_Dir}/python" CACHE PATH "Destination for python modules")
endif()
endif()
set (BUILD_MATLAB ${Matlab_FOUND})
if (BUILD_MATLAB)
Expand Down
2 changes: 1 addition & 1 deletion version_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if (DEVEL_BUILD)
set(DEFAULT_glog_TAG v035)

else()
set(DEFAULT_SIRF_TAG v1.0.0-rc.3)
set(DEFAULT_SIRF_TAG v1.0.0)

## STIR
set(DEFAULT_STIR_URL https://github.com/UCL/STIR )
Expand Down