diff --git a/.gitmodules b/.gitmodules index be852bb8e..990be6e03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -292,3 +292,6 @@ [submodule "src/external/SecurityTokend"] path = src/external/SecurityTokend url = ../darling-SecurityTokend.git +[submodule "src/external/lzfse"] + path = src/external/lzfse + url = ../lzfse.git diff --git a/cmake/darling_static_lib.cmake b/cmake/darling_static_lib.cmake index 68e61cbc4..150ca5955 100644 --- a/cmake/darling_static_lib.cmake +++ b/cmake/darling_static_lib.cmake @@ -1,3 +1,6 @@ +cmake_policy(SET CMP0069 NEW) +cmake_policy(SET CMP0063 NEW) + include(darling_lib) function(add_darling_static_library name) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8836e474..5e04af0b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -231,6 +231,7 @@ include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/ApplicationServices/PrintCore/include ${CMAKE_CURRENT_SOURCE_DIR}/ApplicationServices/SpeechSynthesis/include ${CMAKE_CURRENT_SOURCE_DIR}/ColorSync/include + ${CMAKE_CURRENT_SOURCE_DIR}/external/lzfse/include ) add_subdirectory(external/libkqueue) @@ -411,6 +412,7 @@ add_subdirectory(CoreAudio) add_subdirectory(CoreMedia) add_subdirectory(LDAP) add_subdirectory(ExceptionHandling) +add_subdirectory(external/lzfse) # Just a stub add_subdirectory(WebKit) diff --git a/src/external/darling-dmg b/src/external/darling-dmg index 5f64bc9a3..9d19ebaa7 160000 --- a/src/external/darling-dmg +++ b/src/external/darling-dmg @@ -1 +1 @@ -Subproject commit 5f64bc9a3795e0a1c307e9beb099f9035fdd864f +Subproject commit 9d19ebaa7f1be38e9c274351b620ebde5d91dd0c diff --git a/src/external/lzfse b/src/external/lzfse new file mode 160000 index 000000000..6262d29d2 --- /dev/null +++ b/src/external/lzfse @@ -0,0 +1 @@ +Subproject commit 6262d29d2bb461faab635926b83829819ce44a68