Reconciled 'master' and 'new_alps' branches

CQMP · Nov 27, 2017 · ef01901 · ef01901
2 parents 48422e1 + 4b082d9
commit ef01901
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/kk/CMakeLists.txt b/kk/CMakeLists.txt
@@ -5,13 +5,19 @@ find_package(OpenMP)
 if (OPENMP_FOUND)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
-find_package(Boost 1.56 REQUIRED COMPONENTS program_options)
+
+# find_package(ALPSCore REQUIRED) # does it use ALPSCore?
+set(boost_req program_options)
+find_package (Boost 1.54.0 COMPONENTS ${boost_req} REQUIRED)
+message(STATUS "Found Boost includes: ${Boost_INCLUDE_DIRS}" )
+message(STATUS "Found Boost libs: ${Boost_LIBRARIES}" )
+
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3  -DNDEBUG")
 
 
 add_executable(kk kk.cpp )
-target_link_libraries(kk ${Boost_LIBRARIES} ${GSL_LIBRARIES})
 target_include_directories(kk PUBLIC ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS})
-
+# target_link_libraries(kk ${ALPSCore_LIBRARIES} ${GSL_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(kk ${GSL_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS kk DESTINATION bin)
diff --git a/legendre_convert/CMakeLists.txt b/legendre_convert/CMakeLists.txt
@@ -4,7 +4,10 @@ project(legendre_convert)
 add_executable(legendre_convert legendre_convert.cpp)
 
 set(CMAKE_CXX_FLAGS  "-W -Wno-sign-compare -O2 -g")
-find_package(Boost 1.56 REQUIRED COMPONENTS program_options)
-target_link_libraries(legendre_convert ${Boost_LIBRARIES})
+set(boost_req program_options)
+find_package (Boost 1.54.0 COMPONENTS ${boost_req} REQUIRED)
+message(STATUS "Found Boost includes: ${Boost_INCLUDE_DIRS}" )
+message(STATUS "Found Boost libs: ${Boost_LIBRARIES}" )
 target_include_directories(legendre_convert PUBLIC ${Boost_INCLUDE_DIRS})
+target_link_libraries(legendre_convert ${ALPSCore_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS legendre_convert DESTINATION bin)
diff --git a/pade/pade_arbitrary_degree/CMakeLists.txt b/pade/pade_arbitrary_degree/CMakeLists.txt
@@ -5,10 +5,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(ALPSCore REQUIRED COMPONENTS hdf5 accumulators mc params)
 find_package (Eigen3 3.1 REQUIRED)
+set(boost_req program_options)
+find_package (Boost 1.54.0 COMPONENTS ${boost_req} REQUIRED)
+message(STATUS "Found Boost includes: ${Boost_INCLUDE_DIRS}" )
+message(STATUS "Found Boost libs: ${Boost_LIBRARIES}" )
 
 include_directories(${EIGEN3_INCLUDE_DIR})
 link_directories("/opt/local/lib")
 
 add_executable(pade pade.cpp pade_grid.cpp pade_real.cpp pade_imag.cpp pade_interpolator.cpp pade_solver.cpp)
-target_link_libraries(pade ${ALPSCore_LIBRARIES} gmpxx gmp)
+target_link_libraries(pade ${ALPSCore_LIBRARIES} gmpxx gmp ${Boost_LIBRARIES})
 install(TARGETS pade DESTINATION bin)
diff --git a/src/default_model.hpp b/src/default_model.hpp
@@ -22,6 +22,7 @@
 
 #include <math.h>
 #include <alps/params.hpp>
+#include <iostream>
 #include <boost/shared_ptr.hpp>
 
 

diff --git a/src/maxent_kernel.hpp b/src/maxent_kernel.hpp
@@ -19,6 +19,7 @@
 #pragma once
 #include<vector>
 #include<alps/params.hpp>
+#include<iostream>
 #include"maxent_matrix_def.hpp"
 ///enum that enumerates if we're in time or in frequency
 enum dataspace_type{

diff --git a/test/parmsTest.cpp b/test/parmsTest.cpp
@@ -19,6 +19,7 @@
 
 #include "../src/maxent.hpp"
 #include "gtest.h"
+#include <alps/hdf5.hpp>
 #include <alps/utilities/temporary_filename.hpp>
 #include <alps/hdf5/vector.hpp>
 #include <iostream>