Browse Source

Turn util/str_* into a standalone library

pull/7150/head
Gleb Mazovetskiy 2 years ago
parent
commit
3e22e8065b
  1. 10
      Source/CMakeLists.txt
  2. 3
      test/CMakeLists.txt

10
Source/CMakeLists.txt

@ -188,8 +188,6 @@ set(libdevilutionx_SRCS
utils/pcx_to_clx.cpp
utils/sdl_bilinear_scale.cpp
utils/sdl_thread.cpp
utils/str_cat.cpp
utils/str_case.cpp
utils/surface_to_clx.cpp
utils/timer.cpp)
@ -325,6 +323,13 @@ target_link_libraries(libdevilutionx_utf8 PRIVATE
hoehrmann_utf8
)
add_devilutionx_object_library(libdevilutionx_strings
utils/str_cat.cpp
utils/str_case.cpp
)
target_link_libraries(libdevilutionx_strings PRIVATE
fmt::fmt)
target_link_libraries(libdevilutionx PUBLIC
Threads::Threads
DevilutionX::SDL
@ -332,6 +337,7 @@ target_link_libraries(libdevilutionx PUBLIC
libsmackerdec
simpleini::simpleini
tl
libdevilutionx_strings
libdevilutionx_utf8
${libdevilutionx_DEPS}
)

3
test/CMakeLists.txt

@ -39,12 +39,12 @@ set(tests
rectangle_test
scrollrt_test
stores_test
str_cat_test
timedemo_test
writehero_test
)
set(
standalone_tests
str_cat_test
utf8_test
)
@ -69,5 +69,6 @@ foreach(test_target ${standalone_tests})
endforeach()
target_link_libraries(utf8_test PRIVATE libdevilutionx_utf8)
target_link_libraries(str_cat_test PRIVATE libdevilutionx_strings)
target_include_directories(writehero_test PRIVATE ../3rdParty/PicoSHA2)

Loading…
Cancel
Save