aboutsummaryrefslogtreecommitdiff
path: root/devel/simpleini/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/simpleini/files')
-rw-r--r--devel/simpleini/files/patch-CMakeLists.txt17
-rw-r--r--devel/simpleini/files/patch-cmake-targets41
2 files changed, 9 insertions, 49 deletions
diff --git a/devel/simpleini/files/patch-CMakeLists.txt b/devel/simpleini/files/patch-CMakeLists.txt
index 835b583840f6..55a6a21cdb34 100644
--- a/devel/simpleini/files/patch-CMakeLists.txt
+++ b/devel/simpleini/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig 2023-12-29 02:44:28 UTC
+--- CMakeLists.txt.orig 2025-11-13 10:32:32 UTC
+++ CMakeLists.txt
-@@ -34,6 +34,7 @@ add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS $
-
- add_library(${PROJECT_NAME} INTERFACE)
- add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-+target_compile_definitions(${PROJECT_NAME} INTERFACE SI_NO_CONVERSION)
-
- include(GNUInstallDirs)
+@@ -80,7 +80,7 @@ install(FILES
+ )
+ # only build tests when top level and testing enabled
+-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
++if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND SIMPLEINI_BUILD_TESTS)
+ include(CTest)
+ if(BUILD_TESTING)
+ add_subdirectory(tests)
diff --git a/devel/simpleini/files/patch-cmake-targets b/devel/simpleini/files/patch-cmake-targets
deleted file mode 100644
index 966b2529a634..000000000000
--- a/devel/simpleini/files/patch-cmake-targets
+++ /dev/null
@@ -1,41 +0,0 @@
-From aeacf861a8ad8add5f4974792a88ffea393e41db Mon Sep 17 00:00:00 2001
-From: Alexandre Bouvier <contact@amb.tf>
-Date: Tue, 2 Jan 2024 08:42:03 +0100
-Subject: [PATCH] cmake: fix namespace and include dir (#74)
-
----
- CMakeLists.txt | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 8f09295..7804947 100644
---- CMakeLists.txt
-+++ 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()