Fix boost __int128 pedantic warning, add boost CMake target

Signed-off-by: Andrei Lebedev <[email protected]>
vinaychaudharyofficial · Nov 19, 2017 · 03e0c62 · 03e0c62
1 parent 7513fc0
commit 03e0c62
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -75,14 +75,18 @@ find_package(rxcpp)
 find_package(tbb)
 
 ##########################
-# boost multiprecision   #
+#         boost          #
 ##########################
 find_package(Boost REQUIRED
     COMPONENTS
     filesystem
     system
     )
-
+add_library(boost INTERFACE IMPORTED)
+set_target_properties(boost PROPERTIES
+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}
+    INTERFACE_LINK_LIBRARIES "${Boost_LIBRARIES}"
+    )
 
 ##########################
 #       benchmark        #

diff --git a/iroha-cli/CMakeLists.txt b/iroha-cli/CMakeLists.txt
@@ -61,11 +61,7 @@ target_link_libraries(iroha-cli
     client
     cli-flags_validators
     keys_manager
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    )
-target_include_directories(iroha-cli PUBLIC
-    ${Boost_INCLUDE_DIRS}
+    boost
     )
 
 add_install_step_for_bin(iroha-cli)

diff --git a/irohad/model/converters/CMakeLists.txt b/irohad/model/converters/CMakeLists.txt
@@ -43,7 +43,5 @@ target_link_libraries(pb_model_converters
     schema
     cryptography
     logger
-    )
-target_include_directories(pb_model_converters PUBLIC
-    ${Boost_INCLUDE_DIRS}
+    boost
     )
diff --git a/libs/amount/CMakeLists.txt b/libs/amount/CMakeLists.txt
@@ -22,7 +22,5 @@ add_library(iroha_amount
 target_link_libraries(iroha_amount
     optional
     logger
-    )
-target_include_directories(iroha_amount PUBLIC
-    ${Boost_INCLUDE_DIRS}
+    boost
     )