diff options
Diffstat (limited to 'srcpkgs/cmake-bootstrap/patches/not-needed.patch')
-rw-r--r-- | srcpkgs/cmake-bootstrap/patches/not-needed.patch | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/srcpkgs/cmake-bootstrap/patches/not-needed.patch b/srcpkgs/cmake-bootstrap/patches/not-needed.patch index 4c73eb9766d..11671d25e56 100644 --- a/srcpkgs/cmake-bootstrap/patches/not-needed.patch +++ b/srcpkgs/cmake-bootstrap/patches/not-needed.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -522,12 +522,9 @@ if(BUILD_TESTING) +@@ -524,12 +524,9 @@ if(BUILD_TESTING) endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) @@ -14,7 +14,7 @@ DESTINATION ${CMAKE_DATA_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE -@@ -543,9 +540,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) +@@ -545,9 +542,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) REGEX "Help/(dev|guide)($|/)" EXCLUDE ) @@ -26,7 +26,7 @@ configure_file(Source/CMakeInstallSignTool.cmake.in Source/CMakeInstallSignTool.cmake @ONLY) --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt -@@ -615,11 +615,6 @@ if(KWSYS_INSTALL_DOC_DIR) +@@ -607,11 +607,6 @@ if(KWSYS_INSTALL_DOC_DIR) COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME} ) endif() @@ -40,45 +40,48 @@ #----------------------------------------------------------------------------- --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -1579,8 +1579,6 @@ target_link_libraries(curltest cmcurl) - if(BUILD_TESTING AND CMAKE_CURL_TEST_URL) +@@ -1657,9 +1657,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL add_test(curl curltest ${CMAKE_CURL_TEST_URL}) endif() -- + -install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl) +- + return() # The rest of this file is not needed for building within CMake. ++ ++install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl) #----------------------------------------------------------------------------- - if(0) # This code not needed for building within CMake. + include(GNUInstallDirs) --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -2077,5 +2077,3 @@ add_subdirectory(cat) - add_subdirectory(tar) +@@ -2093,5 +2093,3 @@ add_subdirectory(tar) add_subdirectory(cpio) + add_subdirectory(unzip) ENDIF() - -install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt -@@ -185,5 +185,3 @@ ELSEIF((CMAKE_C_COMPILER_ID STREQUAL "GN - # Disable the old GNU compiler optimizer. - SET_PROPERTY(TARGET cmliblzma PROPERTY COMPILE_FLAGS "-O0") - ENDIF() +@@ -189,5 +189,3 @@ ENDIF() + if(WIN32 AND CMake_BUILD_PCH) + target_precompile_headers(cmliblzma PRIVATE "common/mythread.h") + endif() - -INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmliblzma) --- a/Utilities/cmlibrhash/CMakeLists.txt +++ b/Utilities/cmlibrhash/CMakeLists.txt -@@ -36,5 +36,3 @@ include_directories( - ) +@@ -38,5 +38,3 @@ include_directories( add_library(cmlibrhash ${librhash_sources}) + target_compile_definitions(cmlibrhash PRIVATE NO_IMPORT_EXPORT) - -install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibrhash) --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt -@@ -364,5 +364,3 @@ include_directories( - add_library(cmlibuv STATIC ${uv_sources}) - target_link_libraries(cmlibuv ${uv_libraries}) - set_property(TARGET cmlibuv PROPERTY COMPILE_DEFINITIONS ${uv_defines}) +@@ -354,5 +354,3 @@ set_property(TARGET cmlibuv PROPERTY COM + if(WIN32 AND CMake_BUILD_PCH) + target_precompile_headers(cmlibuv PRIVATE "include/uv.h" "src/win/internal.h") + endif() - -install(FILES LICENSE DESTINATION ${CMAKE_DOC_DIR}/cmlibuv) --- a/Utilities/cmnghttp2/CMakeLists.txt |