Merge remote-tracking branch 'upstream/master' into userreguserreg

1 files changed, 59 insertions, 60 deletions

diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt
index 079ad28ba0..519926e542 100644
--- a/cmake.deps/cmake/LibvtermCMakeLists.txt
+++ b/cmake.deps/cmake/LibvtermCMakeLists.txt
@@ -1,44 +1,72 @@
 cmake_minimum_required(VERSION 3.10)
-project(libvterm LANGUAGES C)
+# Can be removed once minimum version is at least 3.15
+if(POLICY CMP0092)
+  cmake_policy(SET CMP0092 NEW)
+endif()
+project(libvterm C)
+
+add_compile_options(-w)
 
 include(GNUInstallDirs)
-find_package(Perl)
 
-if(MSVC)
-  add_compile_options(/W3)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-else()
-  add_compile_options(-Wall -std=c99)
-endif()
+set(DECDRAWING [[
+ static const struct StaticTableEncoding encoding_DECdrawing = {
+   { .decode = &decode_table },
+   {
+     [0x60] = 0x25C6,
+     [0x61] = 0x2592,
+     [0x62] = 0x2409,
+     [0x63] = 0x240C,
+     [0x64] = 0x240D,
+     [0x65] = 0x240A,
+     [0x66] = 0x00B0,
+     [0x67] = 0x00B1,
+     [0x68] = 0x2424,
+     [0x69] = 0x240B,
+     [0x6a] = 0x2518,
+     [0x6b] = 0x2510,
+     [0x6c] = 0x250C,
+     [0x6d] = 0x2514,
+     [0x6e] = 0x253C,
+     [0x6f] = 0x23BA,
+     [0x70] = 0x23BB,
+     [0x71] = 0x2500,
+     [0x72] = 0x23BC,
+     [0x73] = 0x23BD,
+     [0x74] = 0x251C,
+     [0x75] = 0x2524,
+     [0x76] = 0x2534,
+     [0x77] = 0x252C,
+     [0x78] = 0x2502,
+     [0x79] = 0x2A7D,
+     [0x7a] = 0x2A7E,
+     [0x7b] = 0x03C0,
+     [0x7c] = 0x2260,
+     [0x7d] = 0x00A3,
+     [0x7e] = 0x00B7,
+   }
+ };
+]]
+)
 
-# Generate includes from tables
-file(GLOB TBL_FILES ${CMAKE_SOURCE_DIR}/src/encoding/*.tbl)
-set(TBL_FILES_HEADERS)
-foreach(file ${TBL_FILES})
-  get_filename_component(basename ${file} NAME_WE)
-  set(tname encoding/${basename}.inc)
-  add_custom_command(OUTPUT
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/encoding/
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/tbl2inc_c.cmake ${file} ${CMAKE_BINARY_DIR}/${tname}
-    COMMENT "Generating ${tname}"
-    OUTPUT ${CMAKE_BINARY_DIR}/${tname}
-    )
-  list(APPEND TBL_FILES_HEADERS ${tname})
-  # Only used for verifying that the output of tbl2inc_c.cmake is correct
-  set(tname encoding-test/${basename}.inc)
-  add_custom_command(OUTPUT
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/encoding-test/
-    COMMAND ${PERL_EXECUTABLE} -CSD ${CMAKE_SOURCE_DIR}/tbl2inc_c.pl ${file} > ${CMAKE_BINARY_DIR}/${tname}
-    COMMENT "Generating ${tname}"
-    OUTPUT ${CMAKE_BINARY_DIR}/${tname}
-    )
-endforeach()
+set(UK [[
+ static const struct StaticTableEncoding encoding_uk = {
+   { .decode = &decode_table },
+   {
+     [0x23] = 0x00a3,
+   }
+ };
+]]
+)
+
+file(WRITE src/encoding/DECdrawing.inc "${DECDRAWING}")
+file(WRITE src/encoding/uk.inc "${UK}")
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR})
 
 file(GLOB VTERM_SOURCES ${CMAKE_SOURCE_DIR}/src/*.c)
-add_library(vterm ${VTERM_SOURCES} ${TBL_FILES_HEADERS})
+add_library(vterm ${VTERM_SOURCES})
 install(TARGETS vterm ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(FILES include/vterm.h include/vterm_keycodes.h
@@ -54,33 +82,4 @@ if(NOT WIN32)
   endforeach()
 endif()
 
-# Tests
-add_executable(harness EXCLUDE_FROM_ALL t/harness.c)
-target_link_libraries(harness vterm)
-set_target_properties(harness PROPERTIES
-  # run-test.pl expects to find the harness in t/.libs/
-  RUNTIME_OUTPUT_DIRECTORY t/.libs)
-
-if(Perl_FOUND)
-  file(GLOB TESTFILES ${CMAKE_SOURCE_DIR}/t/*.test)
-  add_custom_target(check)
-  foreach(testfile ${TESTFILES})
-    get_filename_component(target_name ${testfile} NAME_WE)
-    add_custom_target(${target_name}
-      COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/t/run-test.pl ${testfile}
-      COMMENT "**${target_name} **"
-      DEPENDS harness)
-    add_dependencies(check ${target_name})
-  endforeach()
-
-  foreach(header_path ${TBL_FILES_HEADERS})
-    get_filename_component(header_name ${header_path} NAME)
-    set(perl_header_path ${CMAKE_BINARY_DIR}/encoding-test/${header_name})
-    add_custom_target(test-${header_name}
-      COMMAND ${CMAKE_COMMAND} -E compare_files
-              ${header_path} ${perl_header_path}
-      DEPENDS ${header_path} ${perl_header_path})
-  endforeach()
-endif()
-
 # vim: set ft=cmake: