diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d38a36..70d7a72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,9 @@ project(winapi_utf8 CXX) include(cmake/common.cmake) -file(GLOB_RECURSE winapi_utf8_include "include/*.hpp") -file(GLOB winapi_utf8_src "src/*.cpp") -add_library(winapi_utf8 ${winapi_utf8_include} ${winapi_utf8_src}) +file(GLOB_RECURSE winapi_utf8_hpp "include/*.hpp") +file(GLOB winapi_utf8_cpp "src/*.cpp") +add_library(winapi_utf8 ${winapi_utf8_hpp} ${winapi_utf8_cpp}) target_include_directories(winapi_utf8 PUBLIC include/) add_subdirectory(3rdparty/microsoft/SafeInt EXCLUDE_FROM_ALL) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f0c6f85..3664b3d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,10 +1,11 @@ -find_package(Boost REQUIRED COMPONENTS unit_test_framework) - -add_executable(unit_tests main.cpp convert.cpp string.cpp) +file(GLOB unit_tests_cpp "*.cpp") +add_executable(unit_tests ${unit_tests_cpp}) target_link_libraries(unit_tests PRIVATE winapi_utf8) -target_link_libraries(unit_tests PRIVATE Boost::disable_autolinking Boost::unit_test_framework) set_target_properties(unit_tests PROPERTIES OUTPUT_NAME winapi-utf8-unit-tests) +find_package(Boost REQUIRED COMPONENTS unit_test_framework) +target_link_libraries(unit_tests PRIVATE Boost::disable_autolinking Boost::unit_test_framework) + install(TARGETS unit_tests RUNTIME DESTINATION bin) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") install(FILES "$<TARGET_PDB_FILE:unit_tests>" DESTINATION bin OPTIONAL) |