move WITH_BOOTSTRAP option to root project CMakeLists.txt

pull/1748/head
Jeff Becker 3 years ago committed by Jeff
parent f5157c31da
commit f38bf2770d

@ -43,6 +43,12 @@ endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
set(DEFAULT_WITH_BOOTSTRAP ON)
if(APPLE)
set(DEFAULT_WITH_BOOTSTRAP OFF)
endif()
# Core options # Core options
option(USE_AVX2 "enable avx2 code" OFF) option(USE_AVX2 "enable avx2 code" OFF)
option(USE_NETNS "enable networking namespace support. Linux only" OFF) option(USE_NETNS "enable networking namespace support. Linux only" OFF)
@ -61,7 +67,7 @@ option(WITH_TESTS "build unit tests" OFF)
option(WITH_HIVE "build simulation stubs" OFF) option(WITH_HIVE "build simulation stubs" OFF)
option(BUILD_PACKAGE "builds extra components for making an installer (with 'make package')" OFF) option(BUILD_PACKAGE "builds extra components for making an installer (with 'make package')" OFF)
option(BUILD_DAEMON "build lokinet daemon and associated utils" ON) option(BUILD_DAEMON "build lokinet daemon and associated utils" ON)
option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ON) option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ${DEFAULT_WITH_BOOTSTRAP})
include(cmake/enable_lto.cmake) include(cmake/enable_lto.cmake)

@ -1,8 +1,3 @@
set(DEFAULT_WITH_BOOTSTRAP ON)
if(APPLE)
set(DEFAULT_WITH_BOOTSTRAP OFF)
endif()
option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ${DEFAULT_WITH_BOOTSTRAP})
add_executable(lokinet-vpn lokinet-vpn.cpp) add_executable(lokinet-vpn lokinet-vpn.cpp)
if(APPLE) if(APPLE)
@ -11,11 +6,10 @@ if(APPLE)
else() else()
add_executable(lokinet lokinet.cpp) add_executable(lokinet lokinet.cpp)
enable_lto(lokinet lokinet-vpn) enable_lto(lokinet lokinet-vpn)
endif()
if(WITH_BOOTSTRAP) if(WITH_BOOTSTRAP)
add_executable(lokinet-bootstrap lokinet-bootstrap.cpp) add_executable(lokinet-bootstrap lokinet-bootstrap.cpp)
enable_lto(lokinet-bootstrap) enable_lto(lokinet-bootstrap)
endif()
endif() endif()

Loading…
Cancel
Save