diff --git a/CMakeLists.txt b/CMakeLists.txt index 83bcc36fb..256bcf4de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ target_compile_definitions(test-data INTERFACE SIMDJSON_BENCHMARK_DATA_DIR="${CM add_subdirectory(dependencies) add_subdirectory(tools) add_subdirectory(tests) -add_subdirectory(scripts) +add_subdirectory(examples) add_subdirectory(benchmark) # for fuzzing, read the comments in the fuzz/CMakeLists.txt file diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 000000000..f5bd760c5 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(quickstart) diff --git a/examples/quickstart/CMakeLists.txt b/examples/quickstart/CMakeLists.txt new file mode 100644 index 000000000..7b7ff855a --- /dev/null +++ b/examples/quickstart/CMakeLists.txt @@ -0,0 +1,2 @@ +add_executable(quickstart quickstart.cpp) +target_link_libraries(quickstart PRIVATE simdjson) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 138691f6d..d8c30bcbe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,13 +35,15 @@ set_property( # # json2json test # -add_test( - NAME testjson2json - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testjson2json.sh - WORKING_DIRECTORY $ -) -set_property(TEST testjson2json APPEND PROPERTY DEPENDS minify json2json) -set_property(TEST testjson2json APPEND PROPERTY LABELS slowtests) +if (NOT MSVC) # Can't run .sh on windows + add_test( + NAME testjson2json + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testjson2json.sh + WORKING_DIRECTORY $ + ) + set_property(TEST testjson2json APPEND PROPERTY DEPENDS minify json2json) + set_property(TEST testjson2json APPEND PROPERTY LABELS slowtests) +endif() # # Competition parse test @@ -50,7 +52,7 @@ if (SIMDJSON_COMPETITION) add_executable(allparserscheckfile allparserscheckfile.cpp) target_link_libraries(allparserscheckfile competition-all) - add_test(issue150 issue150.sh) + add_test(issue150 ${CMAKE_CURRENT_SOURCE_DIR}/issue150.sh) set_property(TEST issue150 APPEND PROPERTY DEPENDS allparserscheckfile) set_property(TEST issue150 APPEND PROPERTY LABELS slowtests) endif()