From fe4e60b66c1aeccb373b013bfd8396ce413d9d3e Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Thu, 19 Oct 2017 17:01:55 +0100
Subject: First commit of CMakeLists.txt

attempt to use CMake to create the build environment
---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 CMakeLists.txt

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..7eb7185
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,4 @@
+#
+cmake_minimum_required(3.0.2 FATAL_ERROR)
+
+project(FISTA)
\ No newline at end of file
-- 
cgit v1.2.3


From 8b427d82acfaeb4671484bc459343c5e2e412736 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
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
---
 CMakeLists.txt | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 CMakeLists.txt

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..c9e8cb7
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,30 @@
+#   Copyright 2017 Edoardo Pasca
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+cmake_minimum_required (VERSION 3.0)
+
+project(FISTA)
+#https://stackoverflow.com/questions/13298504/using-cmake-with-setup-py
+
+# The version number.
+set (FISTA_VERSION_MAJOR 1)
+set (FISTA_VERSION_MINOR 0)
+
+set (CIL_VERSION_MAJOR 0)
+set (CIL_VERSION_MINOR 9)
+set (CIL_VERSION_PATCH 1)
+
+set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}')
+
+add_subdirectory(src)
\ No newline at end of file
-- 
cgit v1.2.3


From 57ccd56cacb3c437f706324f330af40a3a715f18 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Tue, 24 Oct 2017 12:59:12 +0100
Subject: added targets and cache variables

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d05cdd9..4cfad7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,6 @@ set (CIL_VERSION_MAJOR 0)
 set (CIL_VERSION_MINOR 9)
 set (CIL_VERSION_PATCH 1)
 
-set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}')
+set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}' CACHE INTERNAL "Core Imaging Library version" FORCE)
 
 add_subdirectory(src)
-- 
cgit v1.2.3