changeset 283:b5139fcb0832

cmake: improve listing
author David Demelier <markand@malikania.fr>
date Sun, 20 Dec 2020 13:23:34 +0100
parents a15f77eda9a4
children 9ba73b0ca347
files libmlk-adventure/CMakeLists.txt libmlk-adventure/nls/fr.po libmlk-core/CMakeLists.txt libmlk-core/nls/fr.po libmlk-core/nls/libmlk-core.pot libmlk-rpg/CMakeLists.txt libmlk-rpg/nls/fr.po libmlk-ui/CMakeLists.txt libmlk-ui/nls/fr.po
diffstat 9 files changed, 78 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/libmlk-adventure/CMakeLists.txt	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-adventure/CMakeLists.txt	Sun Dec 20 13:23:34 2020 +0100
@@ -52,6 +52,7 @@
 set(
 	PO
 	${libadventure_SOURCE_DIR}/nls/fr.po
+	${libadventure_SOURCE_DIR}/nls/libmlk-adventure.pot
 )
 
 molko_define_library(
@@ -63,6 +64,4 @@
 	INCLUDES PUBLIC $<BUILD_INTERFACE:${libadventure_SOURCE_DIR}>
 )
 
-source_group(TREE ${libadventure_SOURCE_DIR} FILES ${SOURCES})
-source_group(TREE ${libadventure_SOURCE_DIR} FILES ${ASSETS})
-source_group(TREE ${libadventure_SOURCE_DIR} FILES ${PO})
+source_group(TREE ${libadventure_SOURCE_DIR} FILES ${PO} ${SOURCES})
--- a/libmlk-adventure/nls/fr.po	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-adventure/nls/fr.po	Sun Dec 20 13:23:34 2020 +0100
@@ -1,8 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# fr.po -- French translations for libmlk-adventure
+#
+# Copyright (c) 2020 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
 #, fuzzy
 msgid ""
 msgstr ""
--- a/libmlk-core/CMakeLists.txt	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-core/CMakeLists.txt	Sun Dec 20 13:23:34 2020 +0100
@@ -18,11 +18,10 @@
 
 project(libmlk-core)
 
-include(CheckLibraryExists)
-
 set(
 	PO
 	${libmlk-core_SOURCE_DIR}/nls/fr.po
+	${libmlk-core_SOURCE_DIR}/nls/libmlk-core.pot
 )
 
 set(
@@ -92,8 +91,6 @@
 	${libmlk-core_BINARY_DIR}/sysconfig.h
 )
 
-check_library_exists(m sqrt "" LIBM)
-
 if (MOLKO_WITH_NLS AND Intl_FOUND)
 	list(APPEND LIBS ${Intl_LIBRARIES})
 	list(APPEND INCS ${Intl_INCLUDE_DIRS})
@@ -105,8 +102,8 @@
 	TRANSLATIONS fr
 	LIBRARIES
 		PUBLIC
+			m
 			${LIBS}
-			$<$<BOOL:${LIBM}>:m>
 			libcompat
 			libsqlite
 			SDL2::SDL2
@@ -116,9 +113,6 @@
 	FLAGS
 		PRIVATE
 			_BSD_SOURCE
-			BINDIR="${CMAKE_INSTALL_BINDIR}"
-			PREFIX="${CMAKE_INSTALL_PREFIX}"
-			SHAREDIR="${CMAKE_INSTALL_DATADIR}"
 	INCLUDES
 		PUBLIC
 			${INCS}
@@ -126,6 +120,4 @@
 			$<BUILD_INTERFACE:${libmlk-core_BINARY_DIR}>
 )
 
-source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${SOURCES})
-source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${ASSETS})
-source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${PO})
+source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${ASSETS} ${PO} ${SOURCES})
--- a/libmlk-core/nls/fr.po	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-core/nls/fr.po	Sun Dec 20 13:23:34 2020 +0100
@@ -1,8 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# fr.po -- French translations for libmlk-core
+#
+# Copyright (c) 2020 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
 #, fuzzy
 msgid ""
 msgstr ""
--- a/libmlk-core/nls/libmlk-core.pot	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-core/nls/libmlk-core.pot	Sun Dec 20 13:23:34 2020 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-20 10:24+0100\n"
+"POT-Creation-Date: 2020-12-20 13:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/libmlk-rpg/CMakeLists.txt	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-rpg/CMakeLists.txt	Sun Dec 20 13:23:34 2020 +0100
@@ -89,6 +89,7 @@
 set(
 	PO
 	${libmlk-rpg_SOURCE_DIR}/nls/fr.po
+	${libmlk-rpg_SOURCE_DIR}/nls/libmlk-rpg.pot
 )
 
 molko_define_library(
@@ -109,5 +110,4 @@
 			$<BUILD_INTERFACE:${libmlk-rpg_BINARY_DIR}>
 )
 
-source_group(TREE ${libmlk-rpg_SOURCE_DIR} FILES ${SOURCES})
-source_group(TREE ${libmlk-rpg_SOURCE_DIR} FILES ${PO})
+source_group(TREE ${libmlk-rpg_SOURCE_DIR} FILES ${ASSETS} ${PO} ${SOURCES})
--- a/libmlk-rpg/nls/fr.po	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-rpg/nls/fr.po	Sun Dec 20 13:23:34 2020 +0100
@@ -1,8 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# fr.po -- French translations for libmlk-rpg
+#
+# Copyright (c) 2020 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
 #, fuzzy
 msgid ""
 msgstr ""
--- a/libmlk-ui/CMakeLists.txt	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-ui/CMakeLists.txt	Sun Dec 20 13:23:34 2020 +0100
@@ -27,6 +27,7 @@
 set(
 	PO
 	${libmlk-ui_SOURCE_DIR}/nls/fr.po
+	${libmlk-ui_SOURCE_DIR}/nls/libmlk-ui.pot
 )
 
 set(
@@ -64,6 +65,4 @@
 			$<BUILD_INTERFACE:${libmlk-ui_SOURCE_DIR}>
 )
 
-source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${SOURCES})
-source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${ASSETS})
-source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${PO})
+source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${ASSETS} ${PO} ${SOURCES})
--- a/libmlk-ui/nls/fr.po	Sun Dec 20 11:04:41 2020 +0100
+++ b/libmlk-ui/nls/fr.po	Sun Dec 20 13:23:34 2020 +0100
@@ -1,8 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# fr.po -- French translations for libmlk-ui
+#
+# Copyright (c) 2020 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
 #, fuzzy
 msgid ""
 msgstr ""