From 848f5576267c3e23be47e909a064e4a34d78cd3a Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@gmail.com>
Date: Tue, 19 Mar 2013 09:25:45 -0400
Subject: [PATCH 1/3] Made SHARP building optional

---
 CMakeLists.txt        | 29 +++++++++++++++--------------
 sample/CMakeLists.txt |  4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e77b11e..7faca8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ get_git_head_revision(HEAD GIT_VER)
 option(BUILD_SHARED_LIBS "Build shared libraries." OFF)
 option(BUILD_STATIC_LIBS "Build static libraries." ON)
 option(ENABLE_OPENMP "Enable OpenMP support." OFF)
+option(ENABLE_SHARP "Enable SPHT support." ON)
 
 find_path(NETCDF_INCLUDE_PATH NAMES netcdf.h)
 find_path(NETCDFCPP_INCLUDE_PATH NAMES netcdfcpp.h netcdf)
@@ -30,21 +31,21 @@ find_library(NETCDFCPP_LIBRARY NAMES netcdf_c++ netcdf_c++4)
 find_library(GSL_LIBRARY gsl)
 find_library(GSLCBLAS_LIBRARY gslcblas)
 
-SET(SHARP_SOURCE ${CMAKE_SOURCE_DIR}/external/sharp)
-SET(DEP_BUILD ${CMAKE_SOURCE_DIR}/external/sharp/auto)
-ExternalProject_Add(sharp
-  SOURCE_DIR ${SHARP_SOURCE}
-  BUILD_IN_SOURCE 1 
-  CONFIGURE_COMMAND ${SHARP_SOURCE}/configure --prefix=${DEP_BUILD}
-  BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-  INSTALL_COMMAND echo "No install"
-)
+if (ENABLE_SHARP)
+  SET(SHARP_SOURCE ${CMAKE_SOURCE_DIR}/external/sharp)
+  SET(DEP_BUILD ${CMAKE_SOURCE_DIR}/external/sharp/auto)
+  ExternalProject_Add(sharp
+    SOURCE_DIR ${SHARP_SOURCE}
+    BUILD_IN_SOURCE 1 
+    CONFIGURE_COMMAND ${SHARP_SOURCE}/configure --prefix=${DEP_BUILD}
+    BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+    INSTALL_COMMAND echo "No install"
+  )
+  SET(SHARP_LIBRARY ${DEP_BUILD}/lib/libsharp.a)
+  SET(SHARP_LIBRARIES ${SHARP_LIBRARY})
+  SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include)
+endif (ENABLE_SHARP)
 
-SET(SHARP_LIBRARY ${DEP_BUILD}/lib/libsharp.a)
-SET(FFTPACK_LIBRARY ${DEP_BUILD}/lib/libfftpack.a)
-SET(CUTILS_LIBRARY ${DEP_BUILD}/lib/libc_utils.a)
-SET(SHARP_LIBRARIES ${SHARP_LIBRARY} ${FFTPACK_LIBRARY} ${CUTILS_LIBRARY})
-SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include)
 
 set(HDF5_FIND_COMPONENTS HL CXX)
 if(HDF5_ROOTDIR)
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
index 71da9ca..969480c 100644
--- a/sample/CMakeLists.txt
+++ b/sample/CMakeLists.txt
@@ -52,13 +52,13 @@ if (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND)
   target_link_libraries(test_fft_calls ${tolink} ${FFTW3_LIBRARIES} ${FFTW3F_LIBRARIES})
 endif (FFTW3_FOUND AND FFTW3F_FOUND AND  EIGEN3_FOUND)
 
-if (SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND)
+if (ENABLE_SHARP AND SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND)
   include_directories(${SHARP_INCLUDE_PATH})
   add_executable(test_healpix_calls test_healpix_calls.cpp)
   target_link_libraries(test_healpix_calls ${tolink} ${SHARP_LIBRARIES})
   set_target_properties(test_healpix_calls PROPERTIES COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
   add_dependencies(test_healpix_calls sharp)
-endif (SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND)
+endif (ENABLE_SHARP AND SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND)
 
 add_executable(test_cosmopower test_cosmopower.cpp)
 target_link_libraries(test_cosmopower ${tolink})

From 0f57cca2f532930df4509f7c19660136873408cb Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@gmail.com>
Date: Sun, 7 Apr 2013 14:40:36 -0400
Subject: [PATCH 2/3] Fixed missing explicit std namespace

---
 src/fourier/details/healpix_utility.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fourier/details/healpix_utility.hpp b/src/fourier/details/healpix_utility.hpp
index 8803ae9..11219d6 100644
--- a/src/fourier/details/healpix_utility.hpp
+++ b/src/fourier/details/healpix_utility.hpp
@@ -87,7 +87,7 @@ namespace CosmoTool
       HealpixSpectrum<T> *new_spectrum = new HealpixSpectrum<T>(in_spec.Lmax());
       T *out_d = new_spectrum->data();
 
-      std::copy(data, data + min(size,new_spectrum->size()), out_d);
+      std::copy(data, data + std::min(size,new_spectrum->size()), out_d);
 
       return Spectrum_ptr(new_spectrum);
     }

From 73ab11f3b18ae3a182c45645bb76645a266eda85 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@gmail.com>
Date: Sun, 7 Apr 2013 14:44:04 -0400
Subject: [PATCH 3/3] Added missing sharp dependencies

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7faca8a..c4888a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,10 @@ if (ENABLE_SHARP)
     BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
     INSTALL_COMMAND echo "No install"
   )
+  SET(CUTILS_LIBRARY ${DEP_BUILD}/lib/libc_utils.a)
+  SET(FFTPACK_LIBRARY ${DEP_BUILD}/lib/libfftpack.a)
   SET(SHARP_LIBRARY ${DEP_BUILD}/lib/libsharp.a)
-  SET(SHARP_LIBRARIES ${SHARP_LIBRARY})
+  SET(SHARP_LIBRARIES ${SHARP_LIBRARY} ${FFTPACK_LIBRARY} ${CUTILS_LIBRARY})
   SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include)
 endif (ENABLE_SHARP)