Skip to content

Commit 4fd37fb

Browse files
committed
Add boost on conanfile
1 parent 870f3f1 commit 4fd37fb

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,16 @@ endif(${benchmark_FOUND})
4141
###############################################################################
4242
# Boost
4343
###############################################################################
44-
find_package(Boost 1.58.0 COMPONENTS unit_test_framework program_options REQUIRED)
45-
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
46-
set(LIBS ${LIBS} ${Boost_LIBRARIES})
44+
#find_package(Boost 1.58.0 COMPONENTS unit_test_framework program_options REQUIRED)
45+
#include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
46+
#include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/include/graybat/utils/hana/include/")
47+
#set(LIBS ${LIBS} ${Boost_LIBRARIES})
48+
49+
###############################################################################
50+
# Elegant Progressbars for a More Cililized Age
51+
###############################################################################
52+
#set(elegant-progressbars_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/elegant-progressbars/cmake")
53+
#find_package(elegant-progressbars 1.0.0 REQUIRED CONFIG)
4754

4855
###############################################################################
4956
# Graybat
@@ -166,4 +173,4 @@ foreach(P ${_SOURCES_PRE})
166173
set(_SOURCES ${_SOURCES} ${P})
167174
endif()
168175
endforeach()
169-
ADD_LIBRARY(CLION_DUMMY_TARGET EXCLUDE_FROM_ALL ${_SOURCES})
176+
ADD_LIBRARY(CLION_DUMMY_TARGET EXCLUDE_FROM_ALL ${_SOURCES})

conanfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
zmqcpp/4.1.1@memsharded/stable
33
ZMQ/4.1.1@memsharded/stable
44
Metis/5.1.0.p1@erikzenker/testing
5-
#Boost/1.62.0.beta.1@erikzenker/testing
5+
Boost/1.62.0.beta.1@erikzenker/testing
66

77
[generators]
88
cmake

graybatConfig.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ find_package(ZMQ MODULE 4.0.0 REQUIRED)
7676
set(graybat_INCLUDE_DIRS ${graybat_INCLUDE_DIRS} ${ZMQ_INCLUDE_DIRS})
7777
set(graybat_LIBRARIES ${graybat_LIBRARIES} ${ZMQ_LIBRARIES})
7878

79-
message("${ZMQ_INCLUDE_DIRS}")
80-
message("${ZMQ_LIBRARIES}")
8179

82-
8380
###############################################################################
8481
# Boost LIB
8582
###############################################################################

0 commit comments

Comments
 (0)