mirror of
https://github.com/KingDuckZ/dindexer.git
synced 2025-02-17 11:45:50 +00:00
Tell needed compiler features to cmake instead of -std=c++11 flag
This commit is contained in:
parent
6590898a36
commit
c21779adde
4 changed files with 32 additions and 4 deletions
|
@ -37,8 +37,8 @@ set(DINDEXER_ACTIONS_PATH "${CMAKE_CURRENT_BINARY_DIR}/src" CACHE STRING "Action
|
|||
string(REGEX MATCH "[^/].*" ACTIONS_PATH_INSTALL "${DINDEXER_ACTIONS_PATH}")
|
||||
set(DB_OWNER_NAME "$ENV{USER}" CACHE STRING "Name that will be used as the DB owner name")
|
||||
set(PROJECT_VERSION_BETA "1")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -Wall -Wextra -Wno-missing-field-initializers -O0")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -Wall -Wextra -fomit-frame-pointer -Wno-missing-field-initializers ${march_flag}")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wno-missing-field-initializers -O0")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra -fomit-frame-pointer -Wno-missing-field-initializers ${march_flag}")
|
||||
set(DINDEXER_PUB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
set(PBL_WITH_TESTS OFF)
|
||||
get_git_head_revision(GIT_REFSPEC PROJECT_VERSION_GIT)
|
||||
|
@ -81,6 +81,20 @@ target_include_directories(${PROJECT_NAME} SYSTEM
|
|||
INTERFACE ${PostgreSQL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
target_compile_definitions(${PROJECT_NAME}
|
||||
INTERFACE cxx_nullptr
|
||||
INTERFACE cxx_range_for
|
||||
INTERFACE cxx_lambdas
|
||||
INTERFACE cxx_decltype_auto
|
||||
INTERFACE cxx_defaulted_functions
|
||||
INTERFACE cxx_deleted_functions
|
||||
INTERFACE cxx_auto_type
|
||||
INTERFACE cxx_decltype_incomplete_return_types
|
||||
INTERFACE cxx_defaulted_move_initializers
|
||||
INTERFACE cxx_noexcept
|
||||
INTERFACE cxx_rvalue_references
|
||||
)
|
||||
|
||||
target_include_directories(${bare_name}-inc
|
||||
INTERFACE ${PROJECT_BINARY_DIR}
|
||||
INTERFACE ${CMAKE_SOURCE_DIR}/include
|
||||
|
|
|
@ -24,8 +24,6 @@ add_library(${PROJECT_NAME} SHARED
|
|||
scantask/setbasic.cpp
|
||||
)
|
||||
|
||||
#target_include_directories(${PROJECT_NAME}
|
||||
#)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PRIVATE ${MAGIC_INCLUDE_DIR}
|
||||
)
|
||||
|
@ -39,6 +37,13 @@ target_include_directories(${PROJECT_NAME}
|
|||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
target_compile_features(${PROJECT_NAME}
|
||||
PUBLIC cxx_constexpr
|
||||
PRIVATE cxx_relaxed_constexpr
|
||||
PUBLIC cxx_nullptr
|
||||
PUBLIC cxx_override
|
||||
)
|
||||
|
||||
if (DINDEXER_WITH_MEDIA_AUTODETECT)
|
||||
target_include_directories(${PROJECT_NAME} SYSTEM
|
||||
PRIVATE ${BLKID_INCLUDE_DIRS}
|
||||
|
|
|
@ -25,6 +25,10 @@ target_link_libraries(${PROJECT_NAME}
|
|||
PRIVATE ${Readline_LIBRARY}
|
||||
)
|
||||
|
||||
target_compile_features(${PROJECT_NAME}
|
||||
PUBLIC cxx_alignof
|
||||
)
|
||||
|
||||
string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
|
||||
target_compile_definitions(${PROJECT_NAME}
|
||||
PRIVATE ACTION_NAME="${ACTION_NAME}"
|
||||
|
|
|
@ -15,6 +15,11 @@ target_link_libraries(${PROJECT_NAME}
|
|||
PRIVATE pqtypes
|
||||
)
|
||||
|
||||
target_compile_features(${PROJECT_NAME}
|
||||
PUBLIC cxx_constexpr
|
||||
PUBLIC cxx_alignof
|
||||
)
|
||||
|
||||
#install(TARGETS ${PROJECT_NAME}
|
||||
# LIBRARY DESTINATION lib
|
||||
# RUNTIME DESTINATION bin
|
||||
|
|
Loading…
Add table
Reference in a new issue