diff --git a/CMakeLists.txt b/CMakeLists.txt index ad2b88a65cef6e39372fa552dd7008aef1da8581_Q01ha2VMaXN0cy50eHQ=..c1270f8887703d0e325669ba4dcd52a10713a780_Q01ha2VMaXN0cy50eHQ= 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,15 +357,10 @@ if(LIBXSLT_WITH_TESTS) enable_testing() - if (NOT MSVC) - # TODO: - # - Unsupported encoding windows-1251 - # - Segfault in exslt dynamic tests - - add_executable(runtest tests/runtest.c) - target_link_libraries(runtest LibXslt LibExslt) - add_test( - NAME runtest COMMAND runtest - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests" - ) + add_executable(runtest tests/runtest.c) + target_link_libraries(runtest LibXslt LibExslt) + add_test( + NAME runtest COMMAND runtest + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests" + ) @@ -371,22 +366,22 @@ - if (LIBXSLT_WITH_MODULES) - add_library(testplugin SHARED tests/testplugin.c) - target_link_libraries(testplugin LibExslt LibXslt) - set_target_properties( - testplugin PROPERTIES - PREFIX "" - OUTPUT_NAME xmlsoft_org_xslt_testplugin - ) - # There must be an easier way... - get_cmake_property(MULTI_CONFIG GENERATOR_IS_MULTI_CONFIG) - if (MULTI_CONFIG) - set(PLUGINS_PATH ${PROJECT_BINARY_DIR}/$<CONFIG>) - else() - set(PLUGINS_PATH ${PROJECT_BINARY_DIR}) - endif() - set_tests_properties( - runtest PROPERTIES - ENVIRONMENT LIBXSLT_PLUGINS_PATH=${PLUGINS_PATH} + if (LIBXSLT_WITH_MODULES) + add_library(testplugin SHARED tests/testplugin.c) + target_link_libraries(testplugin LibExslt LibXslt) + set_target_properties( + testplugin PROPERTIES + PREFIX "" + OUTPUT_NAME xmlsoft_org_xslt_testplugin + ) + # There must be an easier way... + get_cmake_property(MULTI_CONFIG GENERATOR_IS_MULTI_CONFIG) + if (MULTI_CONFIG) + set(PLUGINS_PATH ${PROJECT_BINARY_DIR}/$<CONFIG>) + else() + set(PLUGINS_PATH ${PROJECT_BINARY_DIR}) + endif() + set_tests_properties( + runtest PROPERTIES + ENVIRONMENT LIBXSLT_PLUGINS_PATH=${PLUGINS_PATH} ) endif()