aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-05 14:54:36 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-05 14:54:36 -0700
commitae1385c7e46fd35f4e1a89fd0fda5ec828a85c41 (patch)
tree484427e28e9f8a58f1fa408bf6472af5543d8db5 /bench
parent73b00129451f53a3a701397617c765ec2eb87851 (diff)
parentceee1c008b6d618a48846283e1f18ba1b4cc171a (diff)
Pull the latest updates from trunk
Diffstat (limited to 'bench')
-rw-r--r--bench/btl/libs/blaze/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/bench/btl/libs/blaze/CMakeLists.txt b/bench/btl/libs/blaze/CMakeLists.txt
index f8b1b2ec3..e99a0855c 100644
--- a/bench/btl/libs/blaze/CMakeLists.txt
+++ b/bench/btl/libs/blaze/CMakeLists.txt
@@ -1,10 +1,13 @@
find_package(BLAZE)
-find_package(Boost)
+find_package(Boost COMPONENTS system)
if (BLAZE_FOUND AND Boost_FOUND)
include_directories(${BLAZE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
btl_add_bench(btl_blaze main.cpp)
+ # Note: The newest blaze version requires C++14.
+ # Ideally, we should set this depending on the version of Blaze we found
+ set_property(TARGET btl_blaze PROPERTY CXX_STANDARD 14)
if(BUILD_btl_blaze)
- target_link_libraries(btl_blaze ${Boost_LIBRARIES} ${Boost_system_LIBRARY} /opt/local/lib/libboost_system-mt.a )
+ target_link_libraries(btl_blaze ${Boost_LIBRARIES})
endif()
endif ()