Revise CMake utilities, folders, and tests (#1503)

Signed-off-by: Juan Cruz Viotti <[email protected]>

Makefile

@@ -31,7 +31,7 @@ lint: .always
 test: .always
 	$(CMAKE) -E env UBSAN_OPTIONS=print_stacktrace=1 \
 		$(CTEST) --test-dir ./build --build-config $(PRESET) \
-			--output-on-failure --progress --parallel
+			--output-on-failure --parallel
 
 benchmark: .always
 	$(CMAKE) --build ./build --config $(PRESET) --target benchmark_all

benchmark/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 if(BENCHMARK_SOURCES)
   sourcemeta_googlebenchmark(NAMESPACE sourcemeta PROJECT core
-    FOLDER "Core" SOURCES ${BENCHMARK_SOURCES})
+    SOURCES ${BENCHMARK_SOURCES})
 
   target_compile_definitions(sourcemeta_core_benchmark
     PRIVATE CURRENT_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}")

cmake/common/targets/executable.cmake

@@ -1,24 +1,23 @@
 function(sourcemeta_executable)
   cmake_parse_arguments(SOURCEMETA_EXECUTABLE ""
-    "NAMESPACE;PROJECT;NAME;FOLDER;VARIANT;OUTPUT" "SOURCES" ${ARGN})
+    "NAMESPACE;PROJECT;NAME;VARIANT;OUTPUT" "SOURCES" ${ARGN})
 
   if(NOT SOURCEMETA_EXECUTABLE_PROJECT)
     message(FATAL_ERROR "You must pass the project name using the PROJECT option")
   endif()
   if(NOT SOURCEMETA_EXECUTABLE_NAME)
     message(FATAL_ERROR "You must pass the executable name using the NAME option")
   endif()
-  if(NOT SOURCEMETA_EXECUTABLE_FOLDER)
-    message(FATAL_ERROR "You must pass the folder name using the FOLDER option")
-  endif()
   if(NOT SOURCEMETA_EXECUTABLE_SOURCES)
     message(FATAL_ERROR "You must pass the sources list using the SOURCES option")
   endif()
 
   if(SOURCEMETA_EXECUTABLE_NAMESPACE)
     set(TARGET_NAME "${SOURCEMETA_EXECUTABLE_NAMESPACE}_${SOURCEMETA_EXECUTABLE_PROJECT}_${SOURCEMETA_EXECUTABLE_NAME}")
+    set(FOLDER_NAME "${SOURCEMETA_EXECUTABLE_NAMESPACE}/${SOURCEMETA_EXECUTABLE_PROJECT}/${SOURCEMETA_EXECUTABLE_NAME}")
   else()
     set(TARGET_NAME "${SOURCEMETA_EXECUTABLE_PROJECT}_${SOURCEMETA_EXECUTABLE_NAME}")
+    set(FOLDER_NAME "${SOURCEMETA_EXECUTABLE_PROJECT}/${SOURCEMETA_EXECUTABLE_NAME}")
   endif()
 
   if(SOURCEMETA_EXECUTABLE_VARIANT)
@@ -31,5 +30,5 @@ function(sourcemeta_executable)
 
   add_executable("${TARGET_NAME}" ${SOURCEMETA_EXECUTABLE_SOURCES})
   sourcemeta_add_default_options(PRIVATE ${TARGET_NAME})
-  set_target_properties("${TARGET_NAME}" PROPERTIES FOLDER "${SOURCEMETA_EXECUTABLE_FOLDER}")
+  set_target_properties("${TARGET_NAME}" PROPERTIES FOLDER "${FOLDER_NAME}")
 endfunction()

cmake/common/targets/googlebenchmark.cmake

@@ -1,26 +1,25 @@
 function(sourcemeta_googlebenchmark)
   cmake_parse_arguments(SOURCEMETA_GOOGLEBENCHMARK ""
-    "NAMESPACE;PROJECT;FOLDER" "SOURCES" ${ARGN})
+    "NAMESPACE;PROJECT" "SOURCES" ${ARGN})
 
   if(NOT SOURCEMETA_GOOGLEBENCHMARK_PROJECT)
     message(FATAL_ERROR "You must pass the project name using the PROJECT option")
   endif()
-  if(NOT SOURCEMETA_GOOGLEBENCHMARK_FOLDER)
-    message(FATAL_ERROR "You must pass the folder name using the FOLDER option")
-  endif()
   if(NOT SOURCEMETA_GOOGLEBENCHMARK_SOURCES)
     message(FATAL_ERROR "You must pass the sources list using the SOURCES option")
   endif()
 
   if(SOURCEMETA_GOOGLEBENCHMARK_NAMESPACE)
     set(TARGET_NAME "${SOURCEMETA_GOOGLEBENCHMARK_NAMESPACE}_${SOURCEMETA_GOOGLEBENCHMARK_PROJECT}_benchmark")
+    set(FOLDER_NAME "${SOURCEMETA_GOOGLEBENCHMARK_NAMESPACE}/${SOURCEMETA_GOOGLEBENCHMARK_PROJECT}")
   else()
     set(TARGET_NAME "${SOURCEMETA_GOOGLEBENCHMARK_PROJECT}_benchmark")
+    set(FOLDER_NAME "${SOURCEMETA_GOOGLEBENCHMARK_PROJECT}")
   endif()
 
   add_executable("${TARGET_NAME}" ${SOURCEMETA_GOOGLEBENCHMARK_SOURCES})
   sourcemeta_add_default_options(PRIVATE ${TARGET_NAME})
-  set_target_properties("${TARGET_NAME}" PROPERTIES FOLDER "${SOURCEMETA_GOOGLEBENCHMARK_FOLDER}")
+  set_target_properties("${TARGET_NAME}" PROPERTIES FOLDER "${FOLDER_NAME}")
   target_link_libraries("${TARGET_NAME}" PRIVATE benchmark::benchmark)
   target_link_libraries("${TARGET_NAME}" PRIVATE benchmark::benchmark_main)
 endfunction()

cmake/common/targets/googletest.cmake

@@ -1,6 +1,6 @@
 function(sourcemeta_googletest)
   cmake_parse_arguments(SOURCEMETA_GOOGLETEST ""
-    "NAMESPACE;PROJECT;NAME;FOLDER;VARIANT" "SOURCES" ${ARGN})
+    "NAMESPACE;PROJECT;NAME;VARIANT" "SOURCES" ${ARGN})
 
   if(SOURCEMETA_GOOGLETEST_VARIANT)
     set(TARGET_VARIANT "${SOURCEMETA_GOOGLETEST_VARIANT}_unit")
@@ -12,7 +12,6 @@ function(sourcemeta_googletest)
     NAMESPACE "${SOURCEMETA_GOOGLETEST_NAMESPACE}"
     PROJECT "${SOURCEMETA_GOOGLETEST_PROJECT}"
     NAME "${SOURCEMETA_GOOGLETEST_NAME}"
-    FOLDER "${SOURCEMETA_GOOGLETEST_FOLDER}"
     VARIANT "${TARGET_VARIANT}"
     SOURCES "${SOURCEMETA_GOOGLETEST_SOURCES}"
     OUTPUT TARGET_NAME)

cmake/common/targets/library.cmake

@@ -1,16 +1,13 @@
 function(sourcemeta_library)
   cmake_parse_arguments(SOURCEMETA_LIBRARY ""
-    "NAMESPACE;PROJECT;NAME;FOLDER;VARIANT" "PRIVATE_HEADERS;SOURCES" ${ARGN})
+    "NAMESPACE;PROJECT;NAME;VARIANT" "PRIVATE_HEADERS;SOURCES" ${ARGN})
 
   if(NOT SOURCEMETA_LIBRARY_PROJECT)
     message(FATAL_ERROR "You must pass the project name using the PROJECT option")
   endif()
   if(NOT SOURCEMETA_LIBRARY_NAME)
     message(FATAL_ERROR "You must pass the library name using the NAME option")
   endif()
-  if(NOT SOURCEMETA_LIBRARY_FOLDER)
-    message(FATAL_ERROR "You must pass the folder name using the FOLDER option")
-  endif()
 
   if(SOURCEMETA_LIBRARY_NAMESPACE)
     set(INCLUDE_PREFIX "include/${SOURCEMETA_LIBRARY_NAMESPACE}/${SOURCEMETA_LIBRARY_PROJECT}")
@@ -42,9 +39,11 @@ function(sourcemeta_library)
   if(SOURCEMETA_LIBRARY_NAMESPACE)
     set(TARGET_NAME "${SOURCEMETA_LIBRARY_NAMESPACE}_${SOURCEMETA_LIBRARY_PROJECT}_${SOURCEMETA_LIBRARY_NAME}")
     set(ALIAS_NAME "${SOURCEMETA_LIBRARY_NAMESPACE}::${SOURCEMETA_LIBRARY_PROJECT}::${SOURCEMETA_LIBRARY_NAME}")
+    set(FOLDER_NAME "${SOURCEMETA_LIBRARY_NAMESPACE}/${SOURCEMETA_LIBRARY_PROJECT}/${SOURCEMETA_LIBRARY_NAME}")
   else()
     set(TARGET_NAME "${SOURCEMETA_LIBRARY_PROJECT}_${SOURCEMETA_LIBRARY_NAME}")
     set(ALIAS_NAME "${SOURCEMETA_LIBRARY_PROJECT}::${SOURCEMETA_LIBRARY_NAME}")
+    set(FOLDER_NAME "${SOURCEMETA_LIBRARY_PROJECT}/${SOURCEMETA_LIBRARY_NAME}")
   endif()
 
   if(SOURCEMETA_LIBRARY_VARIANT)
@@ -92,15 +91,15 @@ function(sourcemeta_library)
         PUBLIC_HEADER "${PUBLIC_HEADER}"
         PRIVATE_HEADER "${ABSOLUTE_PRIVATE_HEADERS}"
         EXPORT_NAME "${export_name}"
-        FOLDER "${SOURCEMETA_LIBRARY_FOLDER}")
+        FOLDER "${FOLDER_NAME}")
   else()
     set_target_properties(${TARGET_NAME}
       PROPERTIES
         OUTPUT_NAME ${TARGET_NAME}
         PUBLIC_HEADER "${PUBLIC_HEADER}"
         PRIVATE_HEADER "${ABSOLUTE_PRIVATE_HEADERS}"
         EXPORT_NAME "${export_name}"
-        FOLDER "${SOURCEMETA_LIBRARY_FOLDER}")
+        FOLDER "${FOLDER_NAME}")
   endif()
 
   if(SOURCEMETA_LIBRARY_SOURCES)

src/core/json/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME json
-  FOLDER "Core/JSON"
   PRIVATE_HEADERS array.h error.h object.h value.h hash.h
   SOURCES grammar.h parser.h stringify.h json.cc json_value.cc)
 

src/core/jsonl/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME jsonl
-  FOLDER "Core/JSONL"
   PRIVATE_HEADERS iterator.h
   SOURCES jsonl.cc iterator.cc grammar.h)
 

src/core/jsonpointer/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME jsonpointer
-  FOLDER "Core/JSON Pointer"
   PRIVATE_HEADERS pointer.h position.h error.h token.h
     walker.h subpointer_walker.h proxy.h
   SOURCES jsonpointer.cc stringify.h parser.h grammar.h position.cc)

src/core/jsonschema/CMakeLists.txt

@@ -3,7 +3,6 @@ set(OFFICIAL_RESOLVER_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/official_resolver.cc")
 include(./official_resolver.cmake)
 
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME jsonschema
-  FOLDER "Core/JSON Schema"
   PRIVATE_HEADERS bundle.h resolver.h
     walker.h frame.h error.h unevaluated.h
     keywords.h transform.h

src/core/regex/CMakeLists.txt

@@ -1,5 +1,4 @@
-sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME regex
-  FOLDER "Core/Regex")
+sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME regex)
 
 if(SOURCEMETA_CORE_INSTALL)
   sourcemeta_library_install(NAMESPACE sourcemeta PROJECT core NAME regex)

src/core/uri/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME uri
-  FOLDER "Core/URI"
   PRIVATE_HEADERS error.h
   SOURCES uri.cc escaping.cc)
 

src/core/yaml/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME yaml
-  FOLDER "Core/YAML"
   PRIVATE_HEADERS error.h
   SOURCES yaml.cc)
 

src/extension/alterschema/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME alterschema
-  FOLDER "Core/AlterSchema"
   SOURCES alterschema.cc
     # Antipattern
     antipattern/const_with_type.h

test/alterschema/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME alterschema
-  FOLDER "Core/AlterSchema"
   SOURCES
     alterschema_lint_2020_12_test.cc
     alterschema_lint_2019_09_test.cc

test/json/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME json
-  FOLDER "Core/JSON"
   SOURCES
     json_array_test.cc
     json_boolean_test.cc
@@ -27,7 +26,6 @@ target_compile_definitions(sourcemeta_core_json_unit
 # JSON Test Suite
 # See https://github.com/nst/JSONTestSuite
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME jsontestsuite
-  FOLDER "Core/JSON"
   SOURCES jsontestsuite.cc)
 target_compile_definitions(sourcemeta_core_jsontestsuite_unit
   PRIVATE JSONTESTSUITE_PATH="${PROJECT_SOURCE_DIR}/vendor/jsontestsuite")

test/jsonl/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME jsonl
-  FOLDER "Core/JSONL"
   SOURCES
     jsonl_parse_test.cc
     jsonl_parse_error_test.cc)

test/jsonpointer/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME jsonpointer
-  FOLDER "Core/JSON Pointer"
   SOURCES
     jsonpointer_empty_pointer_test.cc
     jsonpointer_get_test.cc

test/jsonschema/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME jsonschema
-  FOLDER "Core/JSON Schema"
   SOURCES
     jsonschema_test_utils.h
     jsonschema_identify_2020_12_test.cc
@@ -102,7 +101,6 @@ target_compile_definitions(sourcemeta_core_jsonschema_unit
 # JSON Schema Referencing Suite
 # See https://github.com/python-jsonschema/referencing-suite
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME jsonschema_referencing_suite
-  FOLDER "Core/JSON Schema"
   SOURCES referencingsuite.cc)
 target_compile_definitions(sourcemeta_core_jsonschema_referencing_suite_unit
   PRIVATE REFERENCING_SUITE_PATH="${PROJECT_SOURCE_DIR}/vendor/referencing-suite/tests")

test/packaging/CMakeLists.txt

@@ -1,14 +1,14 @@
 # TODO: Get install path from a variable?
-add_test(NAME packaging.find_package_configure COMMAND
+add_test(NAME ${PROJECT_NAME}.find_package_configure COMMAND
   "${CMAKE_COMMAND}"
   -S "${CMAKE_CURRENT_SOURCE_DIR}/find_package"
   -B "${CMAKE_CURRENT_BINARY_DIR}/find_package"
   "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
   "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH};${PROJECT_SOURCE_DIR}/build/dist"
   "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}")
-add_test(NAME packaging.find_package_build COMMAND
+add_test(NAME ${PROJECT_NAME}.find_package_build COMMAND
   "${CMAKE_COMMAND}"
   --build "${CMAKE_CURRENT_BINARY_DIR}/find_package"
   --config "${CMAKE_BUILD_TYPE}")
-set_tests_properties(packaging.find_package_build
-  PROPERTIES DEPENDS packaging.find_package_configure)
+set_tests_properties(${PROJECT_NAME}.find_package_build
+  PROPERTIES DEPENDS ${PROJECT_NAME}.find_package_configure)

test/regex/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME regex
-  FOLDER "Core/Regex"
   SOURCES regex_matches_test.cc regex_to_regex_test.cc)
 
 target_link_libraries(sourcemeta_core_regex_unit

test/uri/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME uri
-  FOLDER "Core/URI"
   SOURCES
     uri_test.cc
     uri_fragment_test.cc

test/yaml/CMakeLists.txt

@@ -1,5 +1,4 @@
 sourcemeta_googletest(NAMESPACE sourcemeta PROJECT core NAME yaml
-  FOLDER "Core/YAML"
   SOURCES
     yaml_parse_test.cc)