diff --git a/CMake/PackageDepends/MITK_lz4_Config.cmake b/CMake/PackageDepends/MITK_lz4_Config.cmake index b9b2b8ff86..027604f0ab 100644 --- a/CMake/PackageDepends/MITK_lz4_Config.cmake +++ b/CMake/PackageDepends/MITK_lz4_Config.cmake @@ -1,2 +1 @@ -list(APPEND ALL_INCLUDE_DIRECTORIES ${lz4_INCLUDE_DIR}) -list(APPEND ALL_LIBRARIES ${lz4_LIBRARIES}) +list(APPEND ALL_LIBRARIES LZ4::lz4_shared) diff --git a/CMakeExternals/lz4.cmake b/CMakeExternals/lz4.cmake index 5f63e12c42..28a1315826 100644 --- a/CMakeExternals/lz4.cmake +++ b/CMakeExternals/lz4.cmake @@ -1,54 +1,54 @@ #----------------------------------------------------------------------------- # lz4 #----------------------------------------------------------------------------- if(MITK_USE_lz4) # Sanity checks if(DEFINED lz4_DIR AND NOT EXISTS "${lz4_DIR}") message(FATAL_ERROR "lz4_DIR variable is defined but corresponds to non-existing directory") endif() set(proj lz4) set(proj_DEPENDENCIES ) set(lz4_DEPENDS ${proj}) if(NOT DEFINED lz4_DIR) set(additional_args ) if(NOT CMAKE_DEBUG_POSTFIX) list(APPEND additional_args "-DCMAKE_DEBUG_POSTFIX:STRING=d") endif() if(CTEST_USE_LAUNCHERS) list(APPEND additional_args "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" ) endif() ExternalProject_Add(${proj} LIST_SEPARATOR ${sep} GIT_REPOSITORY https://github.com/lz4/lz4.git - GIT_TAG v1.9.3 + GIT_TAG v1.9.4 SOURCE_SUBDIR build/cmake CMAKE_GENERATOR ${gen} CMAKE_GENERATOR_PLATFORM ${gen_platform} CMAKE_ARGS ${ep_common_args} ${additional_args} CMAKE_CACHE_ARGS ${ep_common_cache_args} -DLZ4_BUILD_CLI:BOOL=OFF -DLZ4_BUILD_LEGACY_LZ4C:BOOL=OFF CMAKE_CACHE_DEFAULT_ARGS ${ep_common_cache_default_args} DEPENDS ${proj_DEPENDENCIES} ) set(lz4_DIR "${ep_prefix}") mitkFunctionInstallExternalCMakeProject(${proj}) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif() endif()