Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply cmake-format

This commit is contained in:
Martchus 2019-09-14 20:52:57 +02:00
parent 9cc6be4d4c
commit 7cdfca9407
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/modules/BasicConfig.cmake
View File

@ -401,8 +401,7 @@ if (NOT META_NO_STATIC_ANALYSIS AND FORMATABLE_FILES)
# compose CXX flags for clang-tidy # compose CXX flags for clang-tidy
set(CLANG_TIDY_CXX_FLAGS "") set(CLANG_TIDY_CXX_FLAGS "")
if (NOT META_HEADER_ONLY_LIB) if (NOT META_HEADER_ONLY_LIB)
# deduce flags from target # deduce flags from target, set c++ standard
# set c++ standard
list(APPEND CLANG_TIDY_CXX_FLAGS "-std=c++$<TARGET_PROPERTY:${META_TARGET_NAME},CXX_STANDARD>") list(APPEND CLANG_TIDY_CXX_FLAGS "-std=c++$<TARGET_PROPERTY:${META_TARGET_NAME},CXX_STANDARD>")
# add compile flags # add compile flags
set(PROP "$<TARGET_PROPERTY:${META_TARGET_NAME},COMPILE_FLAGS>") set(PROP "$<TARGET_PROPERTY:${META_TARGET_NAME},COMPILE_FLAGS>")
@ -521,8 +520,7 @@ set(LIB_INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${SELECTED_LIB_SUFFIX}")
# allow user to specify additional libraries to link against (see buildvariables.md for details) # allow user to specify additional libraries to link against (see buildvariables.md for details)
set(USER_DEFINED_ADDITIONAL_LIBRARIES set(USER_DEFINED_ADDITIONAL_LIBRARIES
"" ""
CACHE STRING CACHE STRING "specifies additional libraries to link against (added after any other libraries to the linker line)")
"specifies additional libraries to link against (added after any other libraries to the linker line)")
function (append_user_defined_additional_libraries) function (append_user_defined_additional_libraries)
if (NOT USER_DEFINED_ADDITIONAL_LIBRARIES) if (NOT USER_DEFINED_ADDITIONAL_LIBRARIES)
return() return()
@ -544,11 +542,9 @@ function (append_user_defined_additional_libraries)
# add the additional libs as INTERFACE_LINK_LIBRARIES of the last lib if it is a target # add the additional libs as INTERFACE_LINK_LIBRARIES of the last lib if it is a target
if (TARGET "${LAST_LIB}") if (TARGET "${LAST_LIB}")
# note: Otherwise the INTERFACE_LINK_LIBRARIES of the last target might still come after # note: Otherwise the INTERFACE_LINK_LIBRARIES of the last target might still come after the
# the USER_DEFINED_ADDITIONAL_LIBRARIES on the linker line. # USER_DEFINED_ADDITIONAL_LIBRARIES on the linker line.
set_property(TARGET "${LAST_LIB}" set_property(TARGET "${LAST_LIB}" APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${USER_DEFINED_ADDITIONAL_LIBRARIES})
APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${USER_DEFINED_ADDITIONAL_LIBRARIES})
return() return()
endif () endif ()