Skip to content

Commit 86b3a85

Browse files
committed
Run unit tests with ctest
1 parent 20a4474 commit 86b3a85

File tree

3 files changed

+435
-7
lines changed

3 files changed

+435
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ enable_language(C CXX ASM)
1414

1515
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
1616

17+
include(CTest)
1718
include(OptimizeForArchitecture)
1819

1920
if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@@ -90,6 +91,7 @@ add_subdirectory(jsrc/openssl/sha)
9091
if(BUILD_SHARED_LIBS)
9192
set_target_properties(j-openssl-sha j-sleef j-base64 PROPERTIES
9293
POSITION_INDEPENDENT_CODE ON)
94+
add_subdirectory(test)
9395
endif()
9496
target_link_libraries(j PRIVATE j-openssl-sha j-sleef j-base64)
9597
if(WIN32)

jsrc/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,6 @@ if(NOT BUILD_SHARED_LIBS)
218218
return()
219219
endif()
220220

221-
add_library(tsdll SHARED)
222-
target_link_libraries(tsdll PRIVATE ${STANDARD_MATH_LIBRARY})
223-
target_sources(tsdll PRIVATE
224-
tsdll.c
225-
../makevs/tsdll/tsdll.def
226-
)
227-
228221
add_library(linenoise OBJECT EXCLUDE_FROM_ALL)
229222
target_compile_definitions(linenoise INTERFACE USE_LINENOISE)
230223
target_compile_definitions(linenoise PUBLIC $<$<PLATFORM_ID:Windows>:_CRT_SECURE_NO_WARNINGS>)

0 commit comments

Comments
 (0)