Browse Source

Turn util/parse_int into a standalone library

pull/7150/head
Gleb Mazovetskiy 2 years ago
parent
commit
164dc9dc87
  1. 9
      Source/CMakeLists.txt
  2. 8
      test/CMakeLists.txt

9
Source/CMakeLists.txt

@ -184,7 +184,6 @@ set(libdevilutionx_SRCS
utils/language.cpp
utils/logged_fstream.cpp
utils/paths.cpp
utils/parse_int.cpp
utils/pcx_to_clx.cpp
utils/sdl_bilinear_scale.cpp
utils/sdl_thread.cpp
@ -316,6 +315,13 @@ if(SCREEN_READER_INTEGRATION AND WIN32)
target_compile_definitions(libdevilutionx PRIVATE Tolk)
endif()
add_devilutionx_object_library(libdevilutionx_parse_int
utils/parse_int.cpp
)
target_link_libraries(libdevilutionx_parse_int PUBLIC
tl
)
add_devilutionx_object_library(libdevilutionx_utf8
utils/utf8.cpp
)
@ -337,6 +343,7 @@ target_link_libraries(libdevilutionx PUBLIC
libsmackerdec
simpleini::simpleini
tl
libdevilutionx_parse_int
libdevilutionx_strings
libdevilutionx_utf8
${libdevilutionx_DEPS}

8
test/CMakeLists.txt

@ -32,7 +32,6 @@ set(tests
missiles_test
pack_test
path_test
parse_int_test
player_test
quests_test
random_test
@ -42,8 +41,8 @@ set(tests
timedemo_test
writehero_test
)
set(
standalone_tests
set(standalone_tests
parse_int_test
str_cat_test
utf8_test
)
@ -68,7 +67,8 @@ foreach(test_target ${standalone_tests})
target_include_directories(${test_target} PRIVATE "${PROJECT_SOURCE_DIR}/Source")
endforeach()
target_link_libraries(utf8_test PRIVATE libdevilutionx_utf8)
target_link_libraries(parse_int_test PRIVATE libdevilutionx_parse_int)
target_link_libraries(str_cat_test PRIVATE libdevilutionx_strings)
target_link_libraries(utf8_test PRIVATE libdevilutionx_utf8)
target_include_directories(writehero_test PRIVATE ../3rdParty/PicoSHA2)

Loading…
Cancel
Save