Skip to content

Commit

Permalink
Switch from C++14 to C++17
Browse files Browse the repository at this point in the history
This would help replace boost::optional with std::optional and
completely remove Boost as a dependency of this project.
  • Loading branch information
vasild committed Mar 4, 2020
1 parent f2ea4b9 commit f4112b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ target_include_directories(multiprocess PUBLIC
${Boost_INCLUDE_DIR})
set_target_properties(multiprocess PROPERTIES
PUBLIC_HEADER "${MP_PUBLIC_HEADERS}"
CXX_STANDARD 14
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES)
install(TARGETS multiprocess EXPORT Multiprocess ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/mp)

Expand All @@ -83,7 +83,7 @@ target_link_libraries(mpgen PRIVATE Threads::Threads)
target_link_libraries(mpgen PRIVATE multiprocess)
set_target_properties(mpgen PROPERTIES
INSTALL_RPATH_USE_LINK_PATH TRUE
CXX_STANDARD 14
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES)
install(TARGETS mpgen EXPORT Multiprocess RUNTIME DESTINATION bin)

Expand Down Expand Up @@ -135,7 +135,7 @@ if(BUILD_TESTING AND TARGET CapnProto::kj-test)
target_link_libraries(mptest PRIVATE Threads::Threads)
target_link_libraries(mptest PRIVATE multiprocess)
set_target_properties(mptest PROPERTIES
CXX_STANDARD 14
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES)
add_test(NAME mptest COMMAND mptest)
endif()
2 changes: 1 addition & 1 deletion pkgconfig/libmultiprocess.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Description: Multiprocess IPC library
Version: 0.0

Libs: -L${libdir} -lmultiprocess -L${capnp_prefix}/lib -lcapnp-rpc -lcapnp -lkj-async -lkj -pthread -lpthread
Cflags: -std=c++14 -I${includedir} -I${capnp_prefix}/include -pthread
Cflags: -std=c++17 -I${includedir} -I${capnp_prefix}/include -pthread

0 comments on commit f4112b7

Please sign in to comment.