Skip to content
Snippets Groups Projects
Commit c67a607f authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Fixes for Debian.

parent 1e3da01b
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,9 @@ set -e
# NOTICE: This file is parsed by cmake to create a shell script. Not all syntax
# will play well with cmake. CMAKE replaces @FOO@ and ${FOO} with cmake variable
# values.
if [ -z $MAKEOPTS ]; then
export MAKEOPTS="-j5"
fi
echo "Building pymoose and creating bdist."
export GSL_ROOT_DIR=@GSL_ROOT_DIR@
......@@ -18,7 +21,7 @@ cmake -DCMAKE_INSTALL_PREFIX=@PYMOOSE_INSTALL_DIR@ \
-DVERSION_MOOSE=@VERSION_MOOSE@ \
@CMAKE_PYMOOSE_ARGS@ \
@PYMOOSE_SOURCE_DIR@
make $MAKEOPTS
ctest --output-on-failure
make bdist
make -j3
ctest --output-on-failure || echo "Some tests failed"
make bdist
......@@ -401,7 +401,7 @@ set(EXTRA_ARGS "--prefix ${CMAKE_INSTALL_PREFIX} ${DISTUTILS_EXTRA_ARGS}")
# On Debian/Ubuntu install using debian layout.
# NOTE: Also create setup.cfg file which setup prefix and install-layout
# suitable for DEBIAN systems.
if(${_platform_desc} MATCHES ".*(Ubuntu|Debian).*")
if(${_platform_desc} MATCHES ".*(Ubuntu|debian).*")
list(APPEND EXTRA_ARGS "--install-layout=deb")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/python/setup.cfg
"[install]\nprefix=/usr\ninstall-layout=deb"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment