p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

CMakeLists.txt: omit end{if,foreach} expressions 

Their usefulness was almost negative.
This commit is contained in:
Přemysl Eric Janouch 2020-10-28 11:21:42 +01:00
parent 577fd1b446
commit 0d0d0b6863
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -10,7 +10,7 @@ if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
# -Wunused-function is pretty annoying here, as everything is static # -Wunused-function is pretty annoying here, as everything is static
set (wdisabled "-Wno-unused-function") set (wdisabled "-Wno-unused-function")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}")
endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC) endif ()
# Version # Version
set (project_version "${PROJECT_VERSION}") set (project_version "${PROJECT_VERSION}")
@ -28,8 +28,8 @@ if (GIT_FOUND AND EXISTS "${git_head}")
set (git_ref "${PROJECT_SOURCE_DIR}/.git/${CMAKE_MATCH_1}") set (git_ref "${PROJECT_SOURCE_DIR}/.git/${CMAKE_MATCH_1}")
if (EXISTS "${git_ref}") if (EXISTS "${git_ref}")
configure_file ("${git_ref}" git-ref.tag COPYONLY) configure_file ("${git_ref}" git-ref.tag COPYONLY)
endif (EXISTS "${git_ref}") endif ()
endif (git_head_content MATCHES "^ref: ([^\r\n]+)") endif ()
execute_process (COMMAND ${GIT_EXECUTABLE} describe --tags --match v* execute_process (COMMAND ${GIT_EXECUTABLE} describe --tags --match v*
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@ -37,8 +37,8 @@ if (GIT_FOUND AND EXISTS "${git_head}")
OUTPUT_VARIABLE git_describe OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_VARIABLE git_describe OUTPUT_STRIP_TRAILING_WHITESPACE)
if (NOT git_describe_result) if (NOT git_describe_result)
string (REGEX REPLACE "^v" "" project_version "${git_describe}") string (REGEX REPLACE "^v" "" project_version "${git_describe}")
endif (NOT git_describe_result) endif ()
endif (GIT_FOUND AND EXISTS "${git_head}") endif ()
# Dashes make filenames confusing and upset packaging software # Dashes make filenames confusing and upset packaging software
string (REPLACE "-" "+" project_version_safe "${project_version}") string (REPLACE "-" "+" project_version_safe "${project_version}")
@ -59,7 +59,7 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
# Need this for SIGWINCH in FreeBSD and OpenBSD respectively; # Need this for SIGWINCH in FreeBSD and OpenBSD respectively;
# our POSIX version macros make it undefined # our POSIX version macros make it undefined
add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1) add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") endif ()
# -lrt is only for glibc < 2.17 # -lrt is only for glibc < 2.17
# -liconv may or may not be a part of libc # -liconv may or may not be a part of libc
@ -67,8 +67,8 @@ foreach (extra iconv rt)
find_library (extra_lib_${extra} ${extra}) find_library (extra_lib_${extra} ${extra})
if (extra_lib_${extra}) if (extra_lib_${extra})
list (APPEND project_libraries ${extra_lib_${extra}}) list (APPEND project_libraries ${extra_lib_${extra}})
endif (extra_lib_${extra}) endif ()
endforeach (extra) endforeach ()
include (CheckCSourceRuns) include (CheckCSourceRuns)
set (CMAKE_REQUIRED_LIBRARIES ${project_libraries}) set (CMAKE_REQUIRED_LIBRARIES ${project_libraries})
@ -91,12 +91,12 @@ option (WITH_LUA "Enable support for Lua plugins" ${lua_FOUND})
if (WITH_LUA) if (WITH_LUA)
if (NOT lua_FOUND) if (NOT lua_FOUND)
message (FATAL_ERROR "Lua library not found") message (FATAL_ERROR "Lua library not found")
endif (NOT lua_FOUND) endif ()
list (APPEND degesch_libraries ${lua_LIBRARIES}) list (APPEND degesch_libraries ${lua_LIBRARIES})
include_directories (${lua_INCLUDE_DIRS}) include_directories (${lua_INCLUDE_DIRS})
link_directories (${lua_LIBRARY_DIRS}) link_directories (${lua_LIBRARY_DIRS})
endif (WITH_LUA) endif ()
find_package (Curses) find_package (Curses)
pkg_check_modules (ncursesw ncursesw) pkg_check_modules (ncursesw ncursesw)
@ -106,9 +106,9 @@ if (ncursesw_FOUND)
elseif (CURSES_FOUND) elseif (CURSES_FOUND)
list (APPEND degesch_libraries ${CURSES_LIBRARY}) list (APPEND degesch_libraries ${CURSES_LIBRARY})
include_directories (${CURSES_INCLUDE_DIR}) include_directories (${CURSES_INCLUDE_DIR})
else (CURSES_FOUND) else ()
message (SEND_ERROR "Curses not found") message (SEND_ERROR "Curses not found")
endif (ncursesw_FOUND) endif ()
if ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT)) if ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT))
message (SEND_ERROR "You have to choose either GNU Readline or libedit") message (SEND_ERROR "You have to choose either GNU Readline or libedit")
@ -117,14 +117,14 @@ elseif (WANT_READLINE)
if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
include_directories (/usr/local/include/ereadline) include_directories (/usr/local/include/ereadline)
list (APPEND degesch_libraries ereadline) list (APPEND degesch_libraries ereadline)
else ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") else ()
list (APPEND degesch_libraries readline) list (APPEND degesch_libraries readline)
endif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") endif ()
elseif (WANT_LIBEDIT) elseif (WANT_LIBEDIT)
pkg_check_modules (libedit REQUIRED libedit) pkg_check_modules (libedit REQUIRED libedit)
list (APPEND degesch_libraries ${libedit_LIBRARIES}) list (APPEND degesch_libraries ${libedit_LIBRARIES})
include_directories (${libedit_INCLUDE_DIRS}) include_directories (${libedit_INCLUDE_DIRS})
endif ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT)) endif ()
# Generate a configuration file # Generate a configuration file
set (HAVE_READLINE "${WANT_READLINE}") set (HAVE_READLINE "${WANT_READLINE}")
@ -150,7 +150,7 @@ foreach (name zyklonb degesch kike)
add_executable (${name} ${name}.c ${PROJECT_BINARY_DIR}/config.h) add_executable (${name} ${name}.c ${PROJECT_BINARY_DIR}/config.h)
target_link_libraries (${name} ${project_libraries}) target_link_libraries (${name} ${project_libraries})
add_threads (${name}) add_threads (${name})
endforeach (name) endforeach ()
add_dependencies (kike replies) add_dependencies (kike replies)
add_dependencies (degesch replies) add_dependencies (degesch replies)
@ -168,7 +168,7 @@ if (BUILD_TESTING)
add_test (NAME test-degesch COMMAND test-degesch) add_test (NAME test-degesch COMMAND test-degesch)
add_test (NAME custom-static-analysis add_test (NAME custom-static-analysis
COMMAND ${PROJECT_SOURCE_DIR}/test-static) COMMAND ${PROJECT_SOURCE_DIR}/test-static)
endif (BUILD_TESTING) endif ()
# Various clang-based diagnostics, loads of fake positives and spam # Various clang-based diagnostics, loads of fake positives and spam
file (GLOB clang_tidy_sources *.c) file (GLOB clang_tidy_sources *.c)
@ -196,7 +196,7 @@ install (DIRECTORY plugins/degesch/
find_program (HELP2MAN_EXECUTABLE help2man) find_program (HELP2MAN_EXECUTABLE help2man)
if (NOT HELP2MAN_EXECUTABLE) if (NOT HELP2MAN_EXECUTABLE)
message (FATAL_ERROR "help2man not found") message (FATAL_ERROR "help2man not found")
endif (NOT HELP2MAN_EXECUTABLE) endif ()
foreach (page zyklonb degesch kike) foreach (page zyklonb degesch kike)
set (page_output "${PROJECT_BINARY_DIR}/${page}.1") set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
@ -206,7 +206,7 @@ foreach (page zyklonb degesch kike)
"${PROJECT_BINARY_DIR}/${page}" -o ${page_output} "${PROJECT_BINARY_DIR}/${page}" -o ${page_output}
DEPENDS ${page} DEPENDS ${page}
COMMENT "Generating man page for ${page}" VERBATIM) COMMENT "Generating man page for ${page}" VERBATIM)
endforeach (page) endforeach ()
add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES}) add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
@ -214,7 +214,7 @@ foreach (page ${project_MAN_PAGES})
string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}") string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
install (FILES "${page}" install (FILES "${page}"
DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}") DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
endforeach (page) endforeach ()
# CPack # CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot")