fix

Author: flagarde

CMakeLists.txt

@@ -31,6 +31,7 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE CACHE STRING "C++ standard required" FORCE)
 set(CMAKE_CXX_EXTENSIONS FALSE CACHE STRING "C++ extensions" FORCE)
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 option(CPPTERMINAL_BUILD_EXAMPLES "Set to ON to build examples" ON)
 option(CPPTERMINAL_ENABLE_INSTALL "Set to ON to enable install" ON)
@@ -39,13 +40,13 @@ option(CPPTERMINAL_ENABLE_DOCS "Set to ON to generate documentation" ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_subdirectory(cpp-terminal)
-
 if(CPPTERMINAL_ENABLE_TESTING)
   enable_testing()
   add_subdirectory(tests)
 endif()
 
+add_subdirectory(cpp-terminal)
+
 if(CPPTERMINAL_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()

cpp-terminal/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(GNUInstallDirs)
+
 add_subdirectory(private)
 
 set(CPP_TERMINAL_PUBLIC_HEADERS
@@ -49,20 +51,18 @@ set(CPP_TERMINAL_SRC
 
 # create and configure library target
 add_library(cpp-terminal "${CPP_TERMINAL_SRC}")
-target_link_libraries(cpp-terminal PRIVATE Warnings::Warnings cpp-terminal::cpp-terminal-private)
-target_compile_options(cpp-terminal PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
-target_include_directories(cpp-terminal PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
+target_link_libraries(cpp-terminal PRIVATE cpp-terminal::cpp-terminal-private)
+target_include_directories(cpp-terminal PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 set_target_properties(cpp-terminal PROPERTIES PUBLIC_HEADER "${CPP_TERMINAL_PUBLIC_HEADERS}")
 
 add_library(cpp-terminal::cpp-terminal ALIAS cpp-terminal)
 
 # Install
 if (CPPTERMINAL_ENABLE_INSTALL)
-  include(GNUInstallDirs)
   include(CMakePackageConfigHelpers)
   configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/cpp-terminalConfig.cmake.in" "${PROJECT_BINARY_DIR}/cmake/cpp-terminalConfig.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cpp-terminal")
   write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cpp-terminalConfigVersion.cmake" COMPATIBILITY AnyNewerVersion)
-  install(TARGETS cpp-terminal cpp-terminal-private cpp-terminalWarnings EXPORT cpp-terminalTargets
+  install(TARGETS cpp-terminal cpp-terminalWarnings cpp-terminal-private EXPORT cpp-terminalTargets
           LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
           ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

cpp-terminal/private/CMakeLists.txt

@@ -3,9 +3,27 @@ find_package(Threads)
 
 # configure version information
 configure_file(version.cpp.in version.cpp)
-
-add_library(cpp-terminal-private STATIC "${CMAKE_CURRENT_BINARY_DIR}/version.cpp" return_code.cpp file_initializer.cpp exception.cpp unicode.cpp conversion.cpp args.cpp terminal_impl.cpp tty.cpp terminfo.cpp input.cpp screen.cpp cursor.cpp file.cpp env.cpp blocking_queue.cpp sigwinch.cpp)
-target_link_libraries(cpp-terminal-private PRIVATE Warnings::Warnings cpp-terminal::cpp-terminal PUBLIC Threads::Threads)
-target_compile_options(cpp-terminal-private PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/utf-8 /wd4668 /wd4514>)
-target_include_directories(cpp-terminal-private PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
+add_library(cpp-terminal-private INTERFACE)
+target_sources(cpp-terminal-private INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/version.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/return_code.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/file_initializer.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/unicode.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/conversion.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/args.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/terminal_impl.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tty.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/terminfo.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/input.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/screen.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cursor.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/file.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/env.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/blocking_queue.cpp>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sigwinch.cpp>
+)
+target_link_libraries(cpp-terminal-private INTERFACE Warnings::Warnings Threads::Threads)
+target_compile_options(cpp-terminal-private INTERFACE $<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
+target_include_directories(cpp-terminal-private INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 add_library(cpp-terminal::cpp-terminal-private ALIAS cpp-terminal-private)

cpp-terminal/private/input.cpp

@@ -6,7 +6,6 @@
 *
 * SPDX-License-Identifier: MIT
 */
-
 #if defined(_WIN32)
   #include "cpp-terminal/private/unicode.hpp"
 
@@ -75,14 +74,22 @@ void sendString(Term::Private::BlockingQueue& events, std::wstring& str)
 
 #endif
 
-std::thread Term::Private::Input::m_thread = std::thread(Term::Private::Input::read_event);
+Term::Private::Input::~Input()
+{
+  if(m_thread.joinable()) m_thread.join();
+}
+
+std::thread Term::Private::Input::m_thread{};
 
 Term::Private::BlockingQueue Term::Private::Input::m_events;
 
 int Term::Private::Input::m_poll{-1};
 
 void Term::Private::Input::init_thread()
 {
+  if(m_thread.joinable()) m_thread.join();
+  std::thread thread(Term::Private::Input::read_event);
+  m_thread.swap(thread);
   Term::Private::Sigwinch::unblockSigwinch();
 #if defined(__linux__)
   m_poll = {::epoll_create1(EPOLL_CLOEXEC)};
@@ -99,7 +106,6 @@ void Term::Private::Input::init_thread()
 
 void Term::Private::Input::read_event()
 {
-  init_thread();
   while(true)
   {
 #if defined(_WIN32)
@@ -309,6 +315,7 @@ void Term::Private::Input::startReading()
   static bool activated{false};
   if(!activated)
   {
+    init_thread();
     m_thread.detach();
     activated = true;
   }

cpp-terminal/private/input.hpp

@@ -22,10 +22,11 @@ namespace Private
 
 class BlockingQueue;
 
-class Input
+class Input final
 {
 public:
   Input();
+  ~Input();
   static void        startReading();
   static Term::Event getEvent();
   static Term::Event getEventBlocking();

examples/CMakeLists.txt

@@ -38,7 +38,6 @@ cppterminal_example(SOURCE prompt_multiline)
 cppterminal_example(SOURCE prompt_not_immediate)
 cppterminal_example(SOURCE prompt_simple)
 cppterminal_example(SOURCE styles)
-cppterminal_example(SOURCE slow_events)
 cppterminal_example(SOURCE utf8)
 cppterminal_example(SOURCE attach_console WIN32)
 cppterminal_example(SOURCE attach_console_minimal WIN32)

examples/events.cpp

@@ -25,9 +25,9 @@ class Loop
   void stop() { m_stop = true; }
   void print_message() const
   {
-    while(m_stop)
+    while(!m_stop)
     {
-      std::this_thread::sleep_for(std::chrono::duration<double, std::milli>(2000));
+      std::this_thread::sleep_for(std::chrono::duration<double, std::milli>(200));
       std::cout << "\tNot waiting..." << std::endl;
     }
   }

examples/slow_events.cpp

@@ -4,14 +4,17 @@ endif()
 
 if(CMAKE_VERSION GREATER_EQUAL 3.11)
   include(FetchContent)
-  FetchContent_Declare(doctest GIT_REPOSITORY https://github.com/doctest/doctest.git GIT_TAG v2.4.11)
-  FetchContent_GetProperties(doctest)
-  if(NOT doctest_POPULATED)
-    set(DOCTEST_NO_INSTALL  TRUE)
-    FetchContent_Populate(doctest)
-    add_subdirectory("${doctest_SOURCE_DIR}" "${doctest_BINARY_DIR}")
+  FetchContent_Declare(doctest GIT_REPOSITORY https://github.com/doctest/doctest.git GIT_TAG dev GIT_PROGRESS TRUE CMAKE_ARGS DOCTEST_NO_INSTALL=TRUE)
+  if(CMAKE_VERSION GREATER_EQUAL 3.14)
+    FetchContent_MakeAvailable(doctest)
     include("${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake")
-    unset(DOCTEST_NO_INSTALL)
+  else()
+    FetchContent_GetProperties(doctest)
+    if(NOT doctest_POPULATED)
+      FetchContent_Populate(doctest)
+      add_subdirectory("${doctest_SOURCE_DIR}" "${doctest_BINARY_DIR}")
+      include("${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake")
+    endif()
   endif()
 else()
   find_package(doctest QUIET)
@@ -26,7 +29,7 @@ endif()
 function(cppterminal_test )
   cmake_parse_arguments(ARG "" "SOURCE" "" ${ARGN})
   add_executable("${ARG_SOURCE}.test" "${ARG_SOURCE}.test.cpp")
-  target_link_libraries("${ARG_SOURCE}.test" PRIVATE doctest::doctest cpp-terminal::cpp-terminal)
+  target_link_libraries("${ARG_SOURCE}.test" PRIVATE cpp-terminal::cpp-terminal doctest::doctest)
   doctest_discover_tests("${ARG_SOURCE}.test")
 endfunction()
 
@@ -42,5 +45,5 @@ cppterminal_test(SOURCE version)
 if (NOT MINGW AND NOT MSYS)
 add_executable(Args args.test.cpp)
 target_link_libraries(Args PRIVATE doctest::doctest cpp-terminal::cpp-terminal)
-doctest_discover_tests(Args EXTRA_ARGS Bonjour Hello 你好)
+doctest_discover_tests(Args EXTRA_ARGS Bonjour Hello 大家好)
 endif()