More CMake tweaks

Author: gershnik

CMakeLists.txt

@@ -65,6 +65,9 @@ add_executable(wsddn)
 
 set_target_properties(argum PROPERTIES FOLDER "Dependencies")
 set_target_properties(sys_string PROPERTIES FOLDER "Dependencies")
+if (TARGET generate_unicode_mappings)
+    set_target_properties(generate_unicode_mappings PROPERTIES FOLDER "Dependencies")
+endif()
 set_target_properties(isptr PROPERTIES FOLDER "Dependencies")
 set_target_properties(ptl PROPERTIES FOLDER "Dependencies")
 if (TARGET LibXml2)

cmake/dependencies.cmake

@@ -40,12 +40,12 @@ function(fetch_dependency name #extras for FetchContent_Declare
         list(APPEND extras ${ARGV${i}})
     endforeach()
 
-    if (CACHE{LAST_WSDDN_PREFER_SYSTEM_${uname}})
+    if ($CACHE{LAST_WSDDN_PREFER_SYSTEM_${uname}})
         set(old_prefer 1)
     else()
         set(old_prefer 0)
     endif()
-
+    
     if (WSDDN_PREFER_SYSTEM_${uname})
         set(new_prefer 1)
     else()
@@ -57,11 +57,18 @@ function(fetch_dependency name #extras for FetchContent_Declare
         unset(${lname}_SOURCE_DIR CACHE)
         unset(${lname}_BINARY_DIR CACHE)
         unset(${name}_FOUND CACHE)
+        if (DEFINED ${lname}_DIR AND "${${lname}_DIR}" STREQUAL "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}")
+            unset(${lname}_DIR CACHE)
+        endif()
     endif()
     set(LAST_WSDDN_PREFER_SYSTEM_${uname} ${WSDDN_PREFER_SYSTEM_${uname}} CACHE INTERNAL "")
 
     if (WSDDN_PREFER_SYSTEM_${uname})
-        set(prefer_system FIND_PACKAGE_ARGS)
+        # string(JSON find_args ERROR_VARIABLE find_args_err GET "${DEPENDECIES_JSON}" ${name} find_args)
+        # if (find_args_err)
+        #     unset(find_args)
+        # endif()
+        set(prefer_system FIND_PACKAGE_ARGS ${find_args})
     else()
         set(prefer_system "")
     endif()