diff options
Diffstat (limited to 'dev-cpp/simpleini/files')
-rw-r--r-- | dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch | 16 | ||||
-rw-r--r-- | dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch | 35 |
2 files changed, 51 insertions, 0 deletions
diff --git a/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch b/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch new file mode 100644 index 000000000000..39347e75f769 --- /dev/null +++ b/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch @@ -0,0 +1,16 @@ +https://github.com/brofield/simpleini/pull/75 +https://github.com/brofield/simpleini/commit/f7862c3dd7ad35becc2741f268e3402e89a37666 +From: Alexandre Bouvier <contact@amb.tf> +Date: Tue, 2 Jan 2024 10:54:44 +0100 +Subject: [PATCH 2/2] cmake: really disable tests (#75) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,5 +72,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE + + if(IS_TOPLEVEL_PROJECT) + include(CTest) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++ add_subdirectory(tests) ++ endif() + endif() diff --git a/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch b/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch new file mode 100644 index 000000000000..7370ae04b8b2 --- /dev/null +++ b/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch @@ -0,0 +1,35 @@ +https://github.com/brofield/simpleini/pull/74 +https://github.com/brofield/simpleini/commit/aeacf861a8ad8add5f4974792a88ffea393e41db +From: Alexandre Bouvier <contact@amb.tf> +Date: Tue, 2 Jan 2024 08:42:03 +0100 +Subject: [PATCH 1/2] cmake: fix namespace and include dir (#74) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in + ) + + install(FILES SimpleIni.h +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + install(TARGETS ${PROJECT_NAME} +@@ -62,12 +62,15 @@ install(FILES + ) + install(EXPORT ${PROJECT_NAME}Targets + DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME} +- NAMESPACE EXPORT_NAMESPACE ++ NAMESPACE ${EXPORT_NAMESPACE} + ) + +-target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) ++target_include_directories(${PROJECT_NAME} INTERFACE ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> ++) + + if(IS_TOPLEVEL_PROJECT) +- enable_testing() ++ include(CTest) + add_subdirectory(tests) + endif() |