From b224327e877353275dc098c8f846c99c5fef551a Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 23 Aug 2017 17:25:41 +0200 Subject: conf.d/cmake: use 00-default-osconfig.cmake for all distro except debian-based Change-Id: I4bf5b9c13d42a26d8116a81fe1eb1b366056b19e Signed-off-by: Stephane Desneux --- conf.d/app-templates | 2 +- conf.d/cmake/00-debian-config.cmake | 1 - conf.d/cmake/00-debian-specific.cmake | 1 + conf.d/cmake/00-default-osconfig.cmake | 1 + conf.d/cmake/00-fedora-config.cmake | 1 - conf.d/cmake/00-suse-config.cmake | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 conf.d/cmake/00-debian-config.cmake create mode 100644 conf.d/cmake/00-debian-specific.cmake create mode 100644 conf.d/cmake/00-default-osconfig.cmake delete mode 100644 conf.d/cmake/00-fedora-config.cmake delete mode 100644 conf.d/cmake/00-suse-config.cmake diff --git a/conf.d/app-templates b/conf.d/app-templates index 2e8abc4..13239eb 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 2e8abc421151b81272f7ab988e494fd29eb431ff +Subproject commit 13239eb068fc122af9338e60c144f9697c0bb2bc diff --git a/conf.d/cmake/00-debian-config.cmake b/conf.d/cmake/00-debian-config.cmake deleted file mode 100644 index 466c4de..0000000 --- a/conf.d/cmake/00-debian-config.cmake +++ /dev/null @@ -1 +0,0 @@ -add_required_module(lua-5.3 REQUIRED lua-5.3>=5.3) diff --git a/conf.d/cmake/00-debian-specific.cmake b/conf.d/cmake/00-debian-specific.cmake new file mode 100644 index 0000000..466c4de --- /dev/null +++ b/conf.d/cmake/00-debian-specific.cmake @@ -0,0 +1 @@ +add_required_module(lua-5.3 REQUIRED lua-5.3>=5.3) diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake new file mode 100644 index 0000000..7b4a99a --- /dev/null +++ b/conf.d/cmake/00-default-osconfig.cmake @@ -0,0 +1 @@ +add_required_module(lua REQUIRED lua>=5.3) diff --git a/conf.d/cmake/00-fedora-config.cmake b/conf.d/cmake/00-fedora-config.cmake deleted file mode 100644 index 7b4a99a..0000000 --- a/conf.d/cmake/00-fedora-config.cmake +++ /dev/null @@ -1 +0,0 @@ -add_required_module(lua REQUIRED lua>=5.3) diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake deleted file mode 100644 index 7b4a99a..0000000 --- a/conf.d/cmake/00-suse-config.cmake +++ /dev/null @@ -1 +0,0 @@ -add_required_module(lua REQUIRED lua>=5.3) -- cgit 1.2.3-korg