summarylogtreecommitdiffstats
path: root/cmake.patch
diff options
context:
space:
mode:
authorkfg2023-06-02 20:22:00 +0200
committerkfg2023-06-02 21:14:35 +0200
commit1d60378731e59f99c9bfe921e5e654d6c2ff2c65 (patch)
treedb24ce0325f526f6d29c8c478e907f5b59829a19 /cmake.patch
parent8373bd564732d867b80cf780c6218505ec75a95c (diff)
downloadaur-1d60378731e59f99c9bfe921e5e654d6c2ff2c65.tar.gz
upgpkg: mingw-w64-cmocka 1.1.7-1
Diffstat (limited to 'cmake.patch')
-rw-r--r--cmake.patch33
1 files changed, 22 insertions, 11 deletions
diff --git a/cmake.patch b/cmake.patch
index 30bd16867901..dbc5b30c31b6 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,12 +1,23 @@
-diff -ruN cmocka-1.1.3/src/CMakeLists.txt patched/src/CMakeLists.txt
---- cmocka-1.1.3/src/CMakeLists.txt 2018-09-27 15:27:59.000000000 +0200
-+++ patched/src/CMakeLists.txt 2018-10-01 23:39:21.928642794 +0200
-@@ -74,6 +74,8 @@
+--- cmocka-1.1.7/src/CMakeLists.txt 2023-02-23 15:05:42.000000000 +0100
++++ patched/src/CMakeLists.txt 2023-06-02 20:57:57.103331604 +0200
+@@ -78,7 +78,7 @@
+ NAMESPACE cmocka::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cmocka)
- install(TARGETS
- ${CMOCKA_SHARED_LIBRARY}
-+ RUNTIME DESTINATION
-+ ${BIN_INSTALL_DIR}
- ARCHIVE DESTINATION
- ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION
+-if (UNIT_TESTING)
++#if (UNIT_TESTING)
+ # Internal library
+ add_library(cmocka-static STATIC ${cmocka_SRCS})
+
+@@ -103,4 +103,10 @@
+ target_link_libraries(cmocka-static PRIVATE ${CMOCKA_LINK_LIBRARIES})
+
+ add_library(cmocka::static ALIAS cmocka-static)
+-endif()
++#endif()
++
++install(TARGETS cmocka-static
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ COMPONENT ${PROJECT_NAME})