Mercurial > molko

changeset 588:0bf939090d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmake: install all headers
author David Demelier <markand@malikania.fr>
date Sun, 19 Mar 2023 10:31:35 +0100
parents c027304ced27
children 1e538203bf25
files cmake/MlkLibrary.cmake cmake/MlkNls.cmake libmlk-core/CMakeLists.txt libmlk-rpg/CMakeLists.txt libmlk-ui/CMakeLists.txt libmlk-util/CMakeLists.txt
diffstat 6 files changed, 57 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/cmake/MlkLibrary.cmake	Sat Mar 18 20:29:15 2023 +0100
+++ b/cmake/MlkLibrary.cmake	Sun Mar 19 10:31:35 2023 +0100
@@ -33,7 +33,7 @@
 	endif ()
 
 	if (LIB_ASSETS)
-		mlk_bcc(ASSETS ${LIB_ASSETS} OUTPUTS_VAR HEADERS)
+		mlk_bcc(ASSETS ${LIB_ASSETS} OUTPUTS_VAR assets)
 	endif ()
 
 	if (LIB_LANGS AND MLK_WITH_NLS)
@@ -41,7 +41,7 @@
 			NAME ${LIB_NAME}
 			LANGS ${LIB_LANGS}
 			SOURCES ${LIB_SOURCES}
-			OUTPUTS_VAR MO
+			OUTPUTS_VAR mo
 		)
 	endif ()
 
@@ -52,10 +52,21 @@
 		mlk_tilesets("${LIB_TILESETS}" ${CMAKE_CURRENT_BINARY_DIR}/tilesets tilesets)
 	endif ()
 
-	add_library(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES} ${HEADERS} ${MO} ${maps} ${tilesets})
+	add_library(
+		${LIB_NAME}
+		${LIB_TYPE}
+		${LIB_ASSETS}
+		${LIB_HEADERS}
+		${LIB_LANGS}
+		${LIB_SOURCES}
+		${assets}
+		${maps}
+		${mo}
+		${tilesets}
+	)
 
 	if (LIB_FOLDER)
-		set_target_properties(${LIB_NAME} PROPERTIES FOLDER extern)
+		set_target_properties(${LIB_NAME} PROPERTIES FOLDER ${LIB_FOLDER})
 	endif ()
 
 	if (LIB_FLAGS)
--- a/cmake/MlkNls.cmake	Sat Mar 18 20:29:15 2023 +0100
+++ b/cmake/MlkNls.cmake	Sun Mar 19 10:31:35 2023 +0100
@@ -76,4 +76,5 @@
 		COMMENT "Updating in-source .pot and .po files"
 	)
 	set_target_properties(po-${_nls_NAME} PROPERTIES FOLDER "nls")
+	source_group(build/mo FILES ${${_nls_OUTPUTS_VAR}})
 endmacro()
--- a/libmlk-core/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
+++ b/libmlk-core/CMakeLists.txt	Sun Mar 19 10:31:35 2023 +0100
@@ -48,6 +48,7 @@
 	${libmlk-core_SOURCE_DIR}/mlk/core/texture.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/trace.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/util.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/window.c
 )
 
 set(
@@ -110,7 +111,7 @@
 
 mlk_library(
 	NAME libmlk-core
-	SOURCES ${HEADERS} ${NLS} ${SOURCES}
+	SOURCES ${SOURCES}
 	HEADERS ${HEADERS}
 	HEADERS_DIRECTORY mlk/core
 	LANGS ${NLS}
@@ -130,4 +131,4 @@
 			${OPENAL_INCLUDE_DIR}
 )
 
-source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${SOURCES} ${NLS})
+source_group(TREE ${libmlk-core_SOURCE_DIR} FILES ${HEADERS} ${SOURCES} ${NLS})
--- a/libmlk-rpg/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
+++ b/libmlk-rpg/CMakeLists.txt	Sun Mar 19 10:31:35 2023 +0100
@@ -21,29 +21,33 @@
 set(
 	SOURCES
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader-file.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader-file.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/message.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/message.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/property.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/property.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/quest.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/quest.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg_p.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/save.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/save.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader-file.c
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader.c
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset.c
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/walksprite.c
+)
+
+set(
+	HEADERS
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader-file.h
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map-loader.h
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/map.h
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/message.h
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader-file.h
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader.h
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset.h
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/walksprite.c
 )
 
 set(
@@ -67,7 +71,9 @@
 
 mlk_library(
 	NAME libmlk-rpg
-	SOURCES ${SOURCES} ${ASSETS} ${NLS}
+	SOURCES ${SOURCES}
+	HEADERS ${HEADERS}
+	HEADERS_DIRECTORY mlk/rpg
 	LANGS ${NLS}
 	ASSETS ${ASSETS}
 	LIBRARIES
@@ -78,4 +84,4 @@
 		PUBLIC $<BUILD_INTERFACE:${libmlk-rpg_SOURCE_DIR}>
 )
 
-source_group(TREE ${libmlk-rpg_SOURCE_DIR} FILES ${SOURCES} ${ASSETS} ${NLS})
+source_group(TREE ${libmlk-rpg_SOURCE_DIR} FILES ${SOURCES} ${HEADERS} ${ASSETS} ${NLS})
--- a/libmlk-ui/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
+++ b/libmlk-ui/CMakeLists.txt	Sun Mar 19 10:31:35 2023 +0100
@@ -21,24 +21,28 @@
 set(
 	SOURCES
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/align.c
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/align.h
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/button.c
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/button.h
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/checkbox.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/debug.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/frame.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/gridmenu.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/label.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/notify.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/ui.c
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/ui_p.h
+)
+
+set(
+	HEADERS
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/align.h
+	${libmlk-ui_SOURCE_DIR}/mlk/ui/button.h
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/checkbox.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/debug.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/debug.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/frame.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/frame.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/gridmenu.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/gridmenu.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/label.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/label.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/notify.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/notify.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/ui.c
 	${libmlk-ui_SOURCE_DIR}/mlk/ui/ui.h
-	${libmlk-ui_SOURCE_DIR}/mlk/ui/ui_p.h
 )
 
 set(
@@ -53,7 +57,9 @@
 
 mlk_library(
 	NAME libmlk-ui
-	SOURCES ${SOURCES} ${ASSETS} ${NLS}
+	SOURCES ${SOURCES}
+	HEADERS ${HEADERS}
+	HEADERS_DIRECTORY mlk/ui
 	LANGS ${NLS}
 	ASSETS ${ASSETS}
 	LIBRARIES libmlk-core
@@ -62,4 +68,4 @@
 		PUBLIC $<BUILD_INTERFACE:${libmlk-ui_SOURCE_DIR}>
 )
 
-source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${SOURCES} ${ASSETS} ${NLS})
+source_group(TREE ${libmlk-ui_SOURCE_DIR} FILES ${SOURCES} ${HEADERS} ${ASSETS} ${NLS})
--- a/libmlk-util/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
+++ b/libmlk-util/CMakeLists.txt	Sun Mar 19 10:31:35 2023 +0100
@@ -37,7 +37,6 @@
 
 set(
 	HEADERS
-	${libmlk-util_BINARY_DIR}/mlk/util/sysconfig.h
 	${libmlk-util_SOURCE_DIR}/mlk/util/dir.h
 	${libmlk-util_SOURCE_DIR}/mlk/util/util.h
 )
@@ -62,7 +61,9 @@
 	NAME libmlk-util
 	SOURCES ${SOURCES}
 	INSTALL
-	HEADERS ${HEADERS}
+	HEADERS
+		${HEADERS}
+		${libmlk-util_BINARY_DIR}/mlk/util/sysconfig.h
 	HEADERS_DIRECTORY mlk/util
 	LIBRARIES ${LIBRARIES}
 	INCLUDES
@@ -72,4 +73,5 @@
 			$<BUILD_INTERFACE:${libmlk-util_BINARY_DIR}/mlk/util>
 )
 
-source_group(TREE ${libmlk-util_SOURCE_DIR} FILES ${SOURCES})
+source_group(TREE ${libmlk-util_SOURCE_DIR} FILES ${HEADERS} ${SOURCES})
+source_group(build ${libmlk-util_BINARY_DIR}/mlk/util/sysconfig.h)