From bd874abcebae787ea1f1fddc138fb67a8abf9c9b Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Sat, 4 Aug 2018 23:06:25 +0100
Subject: working CMake project for Win and conda/no-conda

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d931ee..df596e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ set (RGL_VERSION_MAJOR 1)
 set (RGL_VERSION_MINOR 0)
 
 set (CIL_VERSION_MAJOR 0)
-set (CIL_VERSION_MINOR 9)
+set (CIL_VERSION_MINOR 10)
 set (CIL_VERSION_PATCH 1)
 
 set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}' CACHE INTERNAL "Core Imaging Library version" FORCE)
@@ -31,4 +31,6 @@ set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}
 #include(${CMAKE_SOURCE_DIR}/CMake/FindAnacondaEnvironment.cmake)
 
 add_subdirectory(Core)
-add_subdirectory(Wrappers)
+if (BUILD_WRAPPERS)
+  add_subdirectory(Wrappers)
+endif()
\ No newline at end of file
-- 
cgit v1.2.3


From a490e0a75e810591f87c73e41965fad9187f6cd1 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Sun, 5 Aug 2018 15:56:52 +0100
Subject: added BUILD_PYTHON_WRAPPERS BUILD_MATLAB_WRAPPERS BUILD_CUDA options

---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df596e7..d9a0f5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,10 @@ set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}
 # set the Python variables for the Conda environment
 #include(${CMAKE_SOURCE_DIR}/CMake/FindAnacondaEnvironment.cmake)
 
+option (BUILD_MATLAB_WRAPPERS "Build Matlab Wrappers" OFF)
+option (BUILD_PYTHON_WRAPPERS "Build Python Wrappers" OFF)
+option (CONDA_BUILD "Conda Build" OFF)
+option (BUILD_CUDA "Build the CUDA modules" ON)
+
 add_subdirectory(Core)
-if (BUILD_WRAPPERS)
-  add_subdirectory(Wrappers)
-endif()
\ No newline at end of file
+add_subdirectory(Wrappers)
-- 
cgit v1.2.3


From a02acdfb1aefa9cfe49ac844707d32d8140f94f0 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Tue, 14 Aug 2018 16:06:26 +0100
Subject: removed S from BUILD_PYTHON_WRAPPERS

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a0f5a..a783664 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}
 # set the Python variables for the Conda environment
 #include(${CMAKE_SOURCE_DIR}/CMake/FindAnacondaEnvironment.cmake)
 
-option (BUILD_MATLAB_WRAPPERS "Build Matlab Wrappers" OFF)
-option (BUILD_PYTHON_WRAPPERS "Build Python Wrappers" OFF)
+option (BUILD_MATLAB_WRAPPER "Build Matlab Wrappers" OFF)
+option (BUILD_PYTHON_WRAPPER "Build Python Wrappers" ON)
 option (CONDA_BUILD "Conda Build" OFF)
 option (BUILD_CUDA "Build the CUDA modules" ON)
 
-- 
cgit v1.2.3


From 50739856921f8aeb980f790724b5117308bf9b0e Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Wed, 15 Aug 2018 09:10:52 +0100
Subject: install into MATLAB_DEST dir if WIN32

---
 CMakeLists.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a783664..06e9c78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,5 +35,22 @@ option (BUILD_PYTHON_WRAPPER "Build Python Wrappers" ON)
 option (CONDA_BUILD "Conda Build" OFF)
 option (BUILD_CUDA "Build the CUDA modules" ON)
 
+set(MATLAB_DEST_DIR "" CACHE PATH "Directory of the Matlab wrappers")
+if (MATLAB_DEST_DIR)
+set(MATLAB_DEST "${MATLAB_DEST_DIR}")
+else() 
+set(MATLAB_DEST "${CMAKE_INSTALL_PREFIX}/matlab")
+endif()
+message(STATUS "Matlab wrappers will be installed in " ${MATLAB_DEST})
+
+set(PYTHON_DEST_DIR "" CACHE PATH "Directory of the Matlab wrappers")
+if (PYTHON_DEST_DIR)
+ set(PYTHON_DEST "${PYTHON_DEST_DIR}")
+else() 
+ set(PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/python")
+endif()
+message(STATUS "Python wrappers will be installed in " ${PYTHON_DEST})
+
+
 add_subdirectory(Core)
 add_subdirectory(Wrappers)
-- 
cgit v1.2.3