From b441a28c34f295ac803f0ece6c148be809a36672 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 3 Aug 2023 10:20:15 -0700 Subject: [PATCH] Teach CMake to build ldeinit, update clang-tidy names (#474) Have CMake build ldeinit when configured for X11 display, and update the ever-growing list of names under which clang-tidy may be found (now up to version 16) --- CMakeLists.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 952f46e..9735c46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ ENDIF() find_program( CLANG_TIDY_EXE - NAMES "clang-tidy" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10" + NAMES "clang-tidy" "clang-tidy16" "clang-tidy15" "clang-tidy14" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10" DOC "Path to clang-tidy executable" ) @@ -41,6 +41,10 @@ SET(MAIKO_DEFINITIONS "-DRELEASE=351" ) +SET(MAIKO_INIT_DEFINITIONS + "-DRELEASE=351" "-DINIT" "-DNOVERSION" +) + OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON) OPTION(MAIKO_DISPLAY_SDL "Use SDL for display." OFF) @@ -454,6 +458,18 @@ IF(MAIKO_DISPLAY_X11) TARGET_COMPILE_DEFINITIONS(ldex PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS}) TARGET_INCLUDE_DIRECTORIES(ldex PUBLIC inc) TARGET_LINK_LIBRARIES(ldex ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES}) + + ADD_EXECUTABLE(ldeinit + src/main.c + vdate.c + ${MAIKO_SRCS} + ${MAIKO_HDRS} + ${MAIKO_DISPLAY_X11_SRCS} + ${MAIKO_DISPLAY_X11_HDRS} + ) + TARGET_COMPILE_DEFINITIONS(ldeinit PUBLIC ${MAIKO_INIT_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS}) + TARGET_INCLUDE_DIRECTORIES(ldeinit PUBLIC inc) + TARGET_LINK_LIBRARIES(ldeinit ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES}) ENDIF() IF(MAIKO_DISPLAY_SDL)