[llvm] 2d433ae - Revert "[CMake] Provide Findzstd module"

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2022-10-06T12:03:20+02:00
New Revision: 2d433aebc15b83700f184f0a0738b29a85a096f4

URL: https://github.com/llvm/llvm-project/commit/2d433aebc15b83700f184f0a0738b29a85a096f4
DIFF: https://github.com/llvm/llvm-project/commit/2d433aebc15b83700f184f0a0738b29a85a096f4.diff

LOG: Revert "[CMake] Provide Findzstd module"

This reverts commit 849059861c63f5d89a6956191ecb8da8acf16bdb.

This breaks running llvm tests:

llvm-lit: /home/npopov/repos/llvm-project/llvm/utils/lit/lit/TestingConfig.py:138: fatal: unable to parse config file '/home/npopov/repos/llvm-project/build/test/lit.site.cfg.py', traceback: Traceback (most recent call last):
  File "/home/npopov/repos/llvm-project/llvm/utils/lit/lit/TestingConfig.py", line 127, in load_from_path
    exec(compile(data, path, 'exec'), cfg_globals, None)
  File "/home/npopov/repos/llvm-project/build/test/lit.site.cfg.py", line 48, in <module>
    config.have_zstd = FALSE
NameError: name 'FALSE' is not defined

Added: 
    

Modified: 
    

Removed: 
    llvm/cmake/modules/Findzstd.cmake


################################################################################
diff  --git a/llvm/cmake/modules/Findzstd.cmake b/llvm/cmake/modules/Findzstd.cmake
deleted file mode 100644
index fab9ea803261b..0000000000000
--- a/llvm/cmake/modules/Findzstd.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# Try to find the zstd library
-#
-# If successful, the following variables will be defined:
-# zstd_INCLUDE_DIR
-# zstd_LIBRARY
-# zstd_FOUND
-#
-# Additionally, one of the following import targets will be defined:
-# zstd::libzstd_shared
-# zstd::libzstd_static
-
-if(MSVC)
-  set(zstd_SHARED_LIBRARY_SUFFIX "\\${CMAKE_LINK_LIBRARY_SUFFIX}$")
-  set(zstd_STATIC_LIBRARY_SUFFIX "_static\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-else()
-  set(zstd_SHARED_LIBRARY_SUFFIX "\\${CMAKE_SHARED_LIBRARY_SUFFIX}$")
-  set(zstd_STATIC_LIBRARY_SUFFIX "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-endif()
-
-find_path(zstd_INCLUDE_DIR NAMES zstd.h)
-find_library(zstd_LIBRARY NAMES zstd zstd_static)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-    zstd DEFAULT_MSG
-    zstd_LIBRARY zstd_INCLUDE_DIR
-)
-
-if(zstd_FOUND)
-  if(zstd_LIBRARY MATCHES "${zstd_SHARED_LIBRARY_SUFFIX}$" AND
-     NOT TARGET zstd::libzstd_shared)
-    add_library(zstd::libzstd_shared SHARED IMPORTED)
-    set_target_properties(zstd::libzstd_shared PROPERTIES
-          INTERFACE_INCLUDE_DIRECTORIES "${zstd_INCLUDE_DIR}"
-          IMPORTED_LOCATION "${zstd_LIBRARY}")
-  endif()
-  if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$" AND
-     NOT TARGET zstd::libzstd_static)
-    add_library(zstd::libzstd_static STATIC IMPORTED)
-    set_target_properties(zstd::libzstd_static PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${zstd_INCLUDE_DIR}"
-        IMPORTED_LOCATION "${zstd_LIBRARY}")
-  endif()
-endif()
-
-unset(zstd_SHARED_LIBRARY_SUFFIX)
-unset(zstd_STATIC_LIBRARY_SUFFIX)
-
-mark_as_advanced(zstd_INCLUDE_DIR zstd_LIBRARY)