From 4d74819f0c1a77975165fa8bb96c498ccacdbb7b Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Thu, 31 May 2018 08:48:39 +0100
Subject: removed dependency on boost

---
 Core/CMakeLists.txt                    | 27 ++-------------------------
 Wrappers/Python/CMakeLists.txt         | 16 ++--------------
 Wrappers/Python/conda-recipe/meta.yaml |  5 ++---
 recipes/regularisers/meta.yaml         | 17 ++---------------
 4 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index b4823d3..e596da9 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -12,18 +12,6 @@ set (CIL_VERSION $ENV{CIL_VERSION} CACHE INTERNAL "Core Imaging Library version"
 message("CIL_VERSION ${CIL_VERSION}")
 #include (GenerateExportHeader)
 
-find_package(PythonInterp REQUIRED)
-if (PYTHONINTERP_FOUND)
-  message ("Current Python " ${PYTHON_VERSION_STRING} " found " ${PYTHON_EXECUTABLE})
-  if (PYTHON_VERSION_MAJOR EQUAL "3")
-    set (BOOST_PYTHON "python3")
-	set (BOOST_NUMPY "numpy3")
-  else()
-    set (BOOST_PYTHON "python")
-	set (BOOST_NUMPY "numpy")
-  endif()
-endif()
-
 
 find_package(OpenMP)
 if (OPENMP_FOUND)
@@ -40,15 +28,12 @@ message("CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
 set(CMAKE_BUILD_TYPE "Release")
 
 if(WIN32)
-  set (FLAGS "/DWIN32 /EHsc /DBOOST_ALL_NO_LIB /DCCPiCore_EXPORTS /openmp")
+  set (FLAGS "/DWIN32 /EHsc /DCCPiCore_EXPORTS /openmp")
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
   set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT.lib")
   
-  set (EXTRA_LIBRARIES 
-        #${Boost_LIBRARIES}
-		#"tiff"
-		)
+  set (EXTRA_LIBRARIES)
 		
   message("library lib: ${LIBRARY_LIB}")
   
@@ -58,8 +43,6 @@ elseif(UNIX)
    set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
   
    set (EXTRA_LIBRARIES 
-		#${Boost_LIBRARIES}
-		#"tiff"
 		"gomp"
 		"m"
 		)
@@ -93,12 +76,6 @@ include_directories(cilreg PUBLIC
 					  ${CMAKE_CURRENT_SOURCE_DIR}
 		              ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/
 		              ${CMAKE_CURRENT_SOURCE_DIR}/inpainters_CPU/  )
-#GENERATE_EXPORT_HEADER( cilreg
-#             BASE_NAME cilreg
-#             EXPORT_MACRO_NAME CCPiCore_EXPORTS
-#             EXPORT_FILE_NAME CCPiCore_Exports.h
-#             STATIC_DEFINE cilreg_BUILT_AS_STATIC
-#)
 
 ## Install
 
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt
index 7833b54..fa1a30b 100644
--- a/Wrappers/Python/CMakeLists.txt
+++ b/Wrappers/Python/CMakeLists.txt
@@ -15,13 +15,6 @@ message("CIL_VERSION ${CIL_VERSION}")
 find_package(PythonInterp REQUIRED)
 if (PYTHONINTERP_FOUND)
   message ("Current Python " ${PYTHON_VERSION_STRING} " found " ${PYTHON_EXECUTABLE})
-  if (PYTHON_VERSION_MAJOR EQUAL "3")
-    set (BOOST_PYTHON "python3")
-	set (BOOST_NUMPY "numpy3")
-  else()
-    set (BOOST_PYTHON "python")
-	set (BOOST_NUMPY "numpy")
-  endif()
 endif()
 
 	
@@ -33,21 +26,16 @@ message("CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
 set(CMAKE_BUILD_TYPE "Release")
 
 if(WIN32)
-  set (FLAGS "/DWIN32 /EHsc /DBOOST_ALL_NO_LIB /openmp /DCCPiCore_EXPORTS")
+  set (FLAGS "/DWIN32 /EHsc /openmp /DCCPiCore_EXPORTS")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT.lib")
   
-  set (EXTRA_LIBRARIES 
-        #${Boost_LIBRARIES}
-		#"tiff"
-		)
+  set (EXTRA_LIBRARIES)
 		
   message("library lib: ${LIBRARY_LIB}")
   
 elseif(UNIX)
    set (FLAGS "-fopenmp -O2 -funsigned-char -Wall  -Wl,--no-undefined  -DCCPiReconstructionIterative_EXPORTS -std=c++0x")  
    set (EXTRA_LIBRARIES 
-		#${Boost_LIBRARIES}
-		#"tiff"
 		"gomp"
 		)
 endif()
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 5336d14..2d79984 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -14,10 +14,9 @@ requirements:
     - python
     - numpy x.x
     - setuptools
-    #- boost ==1.64.0
-    #- boost-cpp ==1.64.0
     - cython
     - cil_regulariser
+    - vc 14 # [win and py36] 
     - vc 14 # [win and py35] 
     - vc 9  # [win and py27]
     - cmake 
@@ -25,8 +24,8 @@ requirements:
   run:
     - python
     - numpy x.x
-    #- boost ==1.64
     - cil_regulariser
+    - vc 14 # [win and py36] 
     - vc 14 # [win and py35] 
     - vc 9  # [win and py27]
 
diff --git a/recipes/regularisers/meta.yaml b/recipes/regularisers/meta.yaml
index f204a6b..3ffcd1d 100644
--- a/recipes/regularisers/meta.yaml
+++ b/recipes/regularisers/meta.yaml
@@ -2,8 +2,6 @@ package:
   name: cil_regulariser
   version: {{ environ['CIL_VERSION'] }}
 
-#source:
- # path: ../
 
 build:
   preserve_egg_dir: False
@@ -12,26 +10,15 @@ build:
 
 requirements:
   build:
-    - boost ==1.64.0	
-    - boost-cpp ==1.64.0 
-#    - toolchain
-    - python 3.5 # [py35]
-    - python 2.7 # [py27]
     - cmake >=3.1
-#    - zlib 1.2.11
+    - vc 14 # [win and py36] 
     - vc 14 # [win and py35] 
     - vc 9  # [win and py27]
-#    - libtiff    
-    - numpy
 
   run:
-    - boost ==1.64.0
-#    - libtiff
+    - vc 14 # [win and py36]
     - vc 14 # [win and py35]
     - vc 9  # [win and py27]
-    - python 3.5 # [py35]
-    - python 2.7 # [py27]
-    - numpy
 
 
 about:
-- 
cgit v1.2.3