From 8b427d82acfaeb4671484bc459343c5e2e412736 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Thu, 19 Oct 2017 17:01:55 +0100 Subject: Initial revision of build environment made with CMake Initial revision of build environment made with CMake First commit of CMakeLists.txt attempt to use CMake to create the build environment First commit of CMakeLists.txt attempting to locate conda python environment Added a few files for CMake Many changes for the CMake compilation. Tested CMake build Bugfixes --- src/Python/compile.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/Python/compile.sh.in (limited to 'src/Python/compile.sh.in') diff --git a/src/Python/compile.sh.in b/src/Python/compile.sh.in new file mode 100644 index 0000000..dd29973 --- /dev/null +++ b/src/Python/compile.sh.in @@ -0,0 +1,6 @@ +#!/bin/sh + +export CIL_VERSION=@CIL_VERSION@ +module load python/anaconda +source activate @CONDA_ENVIRONMENT@ +conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi \ No newline at end of file -- cgit v1.2.3 From e3dee52c17c9da457cc4c4e98b7dbb8ce1a644f6 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Mon, 23 Oct 2017 10:50:41 +0100 Subject: Add needed environment variables Adds the environment variables that are needed to compile via conda. --- src/Python/compile.sh.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Python/compile.sh.in') diff --git a/src/Python/compile.sh.in b/src/Python/compile.sh.in index dd29973..ca9f310 100644 --- a/src/Python/compile.sh.in +++ b/src/Python/compile.sh.in @@ -1,6 +1,9 @@ #!/bin/sh +# compile within the right conda environment +#module load python/anaconda +#source activate @CONDA_ENVIRONMENT@ export CIL_VERSION=@CIL_VERSION@ -module load python/anaconda -source activate @CONDA_ENVIRONMENT@ +export LIBRARY_INC=@CONDA_ENVIRONMENT_LIBRARY_INC@ + conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi \ No newline at end of file -- cgit v1.2.3 From 99b106a2ced10136a2a71b42440d8c1ffa4f8d2c Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Mon, 23 Oct 2017 14:47:43 +0100 Subject: Bugfixes for UNIX compilation --- src/Python/compile.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Python/compile.sh.in') diff --git a/src/Python/compile.sh.in b/src/Python/compile.sh.in index ca9f310..93fdba2 100644 --- a/src/Python/compile.sh.in +++ b/src/Python/compile.sh.in @@ -6,4 +6,4 @@ export CIL_VERSION=@CIL_VERSION@ export LIBRARY_INC=@CONDA_ENVIRONMENT_LIBRARY_INC@ -conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi \ No newline at end of file +conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi -- cgit v1.2.3