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

Jump to bottom

Fix python dest #160

Merged
merged 18 commits into from
May 3, 2018
Merged

Fix python dest #160

Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
17676c6
PYTHON_DEST was always overwritten
paskino Apr 10, 2018
1ec22f6
debug message
paskino Apr 11, 2018
ed63cb9
if NOT does not apply to variables
paskino Apr 11, 2018
a4f7bd8
CMake if does not want dereferencing
paskino Apr 11, 2018
403c7a8
removed messages
paskino Apr 11, 2018
e463b9f
added message
paskino Apr 17, 2018
396bba7
use if(NOT PYTHON_DEST)
paskino Apr 17, 2018
ea68ad0
added PYTHON_DEST_DIR and MATLAB_DEST_DIR cached vars
paskino Apr 27, 2018
0ed3bb6
make with one thread to see what goes wrong with travis
paskino Apr 30, 2018
ef26a0c
closed if
paskino May 1, 2018
94e5543
Merge branch 'fix_python_dest' of https://github.com/CCPPETMR/SIRF in…
paskino May 1, 2018
a0f4a5b
closed if for MATLAB_DEST
paskino May 1, 2018
77b01af
fix cache variable set
paskino May 1, 2018
3061ddc
change PYTHON_INSTALL_DIR to PYTHON_DEST_DIR
paskino May 3, 2018
a917055
add explanation on PYTHON_DEST_DIR
paskino May 3, 2018
0261609
fix typo
paskino May 3, 2018
cc357d5
fix another typo
paskino May 3, 2018
688adfa
added info on PYTHON_DEST_DIR and MATLAB_DEST_DIR
paskino May 3, 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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ find_package(PythonInterp)
find_package(PythonLibs)
set (BUILD_PYTHON ${PYTHONLIBS_FOUND})
if (BUILD_PYTHON)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment saying why we do this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks. I'd add something like "If PYTHON_DEST_DIR is not set, we will install in ${CMAKE_INSTALL_PREFIX}/python". I know, obvious maybe...

set(PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/python")
if (PYTHON_DEST)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clearer to say

if (NOT PYTHON_DEST)
  set(...)
endif()

Copy link
Contributor Author

@paskino paskino Apr 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does that work? from the docs I understood it wouldn't with a variable

else()
set(PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/python")
endif()
message(STATUS "Python libraries found")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add the install location to the message

endif()

Expand Down