christian/kNCurses
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Wiki Activity

fixing debug facility in when NDEBUG is set

Browse source 
- changed libvterm.cmake so it is easier to integrate in other projects
This commit is contained in:
Christian Burger 2022-04-14 09:31:19 +02:00
parent 4ca933a158
commit f1d0c012b7
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -17,6 +17,10 @@ add_library(NCursesPtyWindow Window.cpp SingleUserInput.cpp Debug.cpp)
### libraries ### libraries
include("cmake/libvterm.cmake") include("cmake/libvterm.cmake")
if(EXISTS libvtermProject)
add_dependencies(NCursesPtyWindow libvtermProject)
endif()
find_library(UTIL_LIBRARY util) find_library(UTIL_LIBRARY util)
target_link_libraries(NCursesPtyWindow ${CURSES_LIBRARIES} ${LIBVTERM_LIBRARY} ${UTIL_LIBRARY}) target_link_libraries(NCursesPtyWindow ${CURSES_LIBRARIES} ${LIBVTERM_LIBRARY} ${UTIL_LIBRARY})

6
Debug.hpp
View file

@ -118,9 +118,9 @@ namespace krikkel
#define __debug_stringify_switch_case_end_bool(value) #define __debug_stringify_switch_case_end_bool(value)
#define __debug_stringify_switch_case_end_string(value) #define __debug_stringify_switch_case_end_string(value)
#define __debug_stringify_switch_case_end_number(value) #define __debug_stringify_switch_case_end_number(value)
#define __debug_stringify_switch_end() #define __debug_stringify_switch_end(__prop)
#define __debug_make_bytes_printable_table(bytes) #define __debug_make_bytes_printable_table(__bytes)
#define __debug_make_bytes_printable(bytes) #define __debug_make_bytes_printable(__bytes)
#endif /* NDEBUG */ #endif /* NDEBUG */

8
cmake/libvterm.cmake
View file

@ -1,7 +1,12 @@
# @author Christian Burger <christian@krikkel.de> # @author Christian Burger <christian@krikkel.de>
# @brief searches for libvterm and builds it if not found # @brief searches for libvterm and builds it if not found
# #
# requires NCursesPtyWindow target; provides LIBVTERM_LIBRARY # provides LIBVTERM_LIBRARY and include path
# dependency must be added like this:
# if(EXISTS libvtermProject)
# add_dependencies(<targetDependingOn> libvtermProject)
# endif()
find_library(LIBVTERM_LIBRARY NAMES libvterm.so.0.0.2 vterm) find_library(LIBVTERM_LIBRARY NAMES libvterm.so.0.0.2 vterm)
@ -17,5 +22,4 @@ if(LIBVTERM_LIBRARY STREQUAL "LIBVTERM_LIBRARY-NOTFOUND")
ExternalProject_Get_property(libvtermProject SOURCE_DIR) ExternalProject_Get_property(libvtermProject SOURCE_DIR)
set(LIBVTERM_LIBRARY "${SOURCE_DIR}/.libs/libvterm.a") set(LIBVTERM_LIBRARY "${SOURCE_DIR}/.libs/libvterm.a")
include_directories(SYSTEM "${SOURCE_DIR}/include") include_directories(SYSTEM "${SOURCE_DIR}/include")
add_dependencies(NCursesPtyWindow libvtermProject)
endif() endif()