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.bat.in | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/Python/compile.bat.in (limited to 'src/Python/compile.bat.in') diff --git a/src/Python/compile.bat.in b/src/Python/compile.bat.in new file mode 100644 index 0000000..d4ddc92 --- /dev/null +++ b/src/Python/compile.bat.in @@ -0,0 +1,4 @@ +set CIL_VERSION=@CIL_VERSION@ + +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 52f7080153a00bd3f7276a4be0a79f7aa82c6196 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Fri, 20 Oct 2017 17:07:05 +0100 Subject: add conda-forge to the channel --- src/Python/compile.bat.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Python/compile.bat.in') diff --git a/src/Python/compile.bat.in b/src/Python/compile.bat.in index d4ddc92..ab23404 100644 --- a/src/Python/compile.bat.in +++ b/src/Python/compile.bat.in @@ -1,4 +1,4 @@ set CIL_VERSION=@CIL_VERSION@ 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 +conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi -c conda-forge \ 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.bat.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Python/compile.bat.in') diff --git a/src/Python/compile.bat.in b/src/Python/compile.bat.in index ab23404..e5342ed 100644 --- a/src/Python/compile.bat.in +++ b/src/Python/compile.bat.in @@ -1,4 +1,7 @@ set CIL_VERSION=@CIL_VERSION@ -activate @CONDA_ENVIRONMENT@ +set PREFIX=@CONDA_ENVIRONMENT_PREFIX@ +set LIBRARY_INC=@CONDA_ENVIRONMENT_LIBRARY_INC@ + +REM activate @CONDA_ENVIRONMENT@ conda build conda-recipe --python=@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ --numpy=@NUMPY_VERSION@ -c ccpi -c conda-forge \ No newline at end of file -- cgit v1.2.3