Bladeren bron

chore: merge yes/no branches for adding ICU/IDNA

Sam Jaffe 2 weken geleden
bovenliggende
commit
d208bee4f4
1 gewijzigde bestanden met toevoegingen van 8 en 13 verwijderingen
  1. 8 13
      tests/CMakeLists.txt

+ 8 - 13
tests/CMakeLists.txt

@@ -45,14 +45,6 @@ target_compile_definitions(selfvalidate_test
 endif()
 target_link_libraries(selfvalidate_test GTest::gtest GTest::gmock jsoncpp_lib CURL::libcurl)
 
-if (ICU_FOUND)
-  target_link_libraries(selfvalidate_test ICU::uc ICU::i18n)
-endif()
-
-if (IDNA_POPULATED)
-  target_link_libraries(selfvalidate_test ada-idna)
-endif()
-
 string(
   JOIN ":"
   SelfValidateTest_Unsupported
@@ -60,18 +52,21 @@ string(
   "*optional_*ecmascript_regex"
   "*optional_zeroTerminatedFloats"
 )
+set(SelfValidateTest_Unsupported_Suites "")
+set(SelfValidateTest_Unsupported_Cases "*leap second")
 
-if (NOT ${ICU_FOUND})
+if (ICU_FOUND)
+  target_link_libraries(selfvalidate_test ICU::uc ICU::i18n)
+else()
   string(
     APPEND SelfValidateTest_Unsupported
     ":*optional_non_bmp_regex"
   )
 endif()
 
-set(SelfValidateTest_Unsupported_Suites "")
-set(SelfValidateTest_Unsupported_Cases "*leap second")
-
-if (NOT ${IDNA_POPULATED})
+if (IDNA_POPULATED)
+  target_link_libraries(selfvalidate_test ada-idna)
+else()
   string(
     APPEND SelfValidateTest_Unsupported
     ":*optional_*iri*"