1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 19:57:45 +00:00

Properly set C++17

This commit is contained in:
Joshua Goins 2022-04-13 09:26:56 -04:00
parent a5cc9f451f
commit 6f1e1a9e80
2 changed files with 3 additions and 3 deletions

View file

@ -3,8 +3,6 @@ project(Astra)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD 17)
find_package(Qt5 COMPONENTS Core Widgets Network CONFIG REQUIRED) find_package(Qt5 COMPONENTS Core Widgets Network CONFIG REQUIRED)
option(ENABLE_WATCHDOG "Build with Tesseract support (needed for Watchdog)" OFF) option(ENABLE_WATCHDOG "Build with Tesseract support (needed for Watchdog)" OFF)
@ -147,6 +145,8 @@ endif()
add_executable(astra ${SRC}) add_executable(astra ${SRC})
target_link_libraries(astra PUBLIC ${LIBRARIES} libxiv) target_link_libraries(astra PUBLIC ${LIBRARIES} libxiv)
target_compile_features(astra PUBLIC cxx_std_17)
set_target_properties(astra PROPERTIES CXX_EXTENSIONS OFF)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE LICENSE_TXT) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE LICENSE_TXT)
STRING(REPLACE "\n" " \\n" LICENSE_TXT ${LICENSE_TXT}) STRING(REPLACE "\n" " \\n" LICENSE_TXT ${LICENSE_TXT})

2
external/libxiv vendored

@ -1 +1 @@
Subproject commit 851ae281e6687d0f831ce9777fa7c1e9aa43ce51 Subproject commit bde032fa53fedfc0892374597c3d7468ae6077e6