cmake packaging

Author: seishuku

CMakeLists.txt

@@ -1,9 +1,9 @@
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.10)
 
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_STANDARD_REQUIRED True)
 
-project("vkEngine" LANGUAGES C)
+project("vkEngine" LANGUAGES C VERSION 0.0.5)
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 include("fetchDeps")
@@ -95,3 +95,29 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
 endif()
 
 buildShaders()
+
+install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION .)
+
+install(DIRECTORY assets/ DESTINATION assets)
+install(DIRECTORY pipelines/ DESTINATION pipelines FILES_MATCHING PATTERN "*.pipeline")
+install(FILES config.ini README.md LICENSE DESTINATION .)
+
+include(InstallRequiredSystemLibraries)
+
+set(CPACK_PACKAGE_NAME "vkEngine")
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set(CPACK_PACKAGE_CONTACT "nitrogl@gmail.com")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "vkEngine - Not a demo, demo.")
+set(CPACK_PACKAGE_VENDOR "NitroGL")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    set(CPACK_GENERATOR "ZIP")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(CPACK_GENERATOR "TGZ")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
+	message("???")
+endif()
+
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}")
+
+include(CPack)

cmake/buildWindows.cmake

@@ -1,6 +1,6 @@
 function("buildWindows")
 	set(PA_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-	add_subdirectory(deps/portaudio)
+	add_subdirectory(deps/portaudio EXCLUDE_FROM_ALL)
 
     add_definitions(-DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CONSOLE)
 	list(APPEND PROJECT_SOURCES audio/backend/portaudio.c system/win32/win32.c)

cmake/fetchDeps.cmake

@@ -7,14 +7,14 @@ function(fetchDeps)
 	find_program(GLSLC NAMES glslc HINTS Vulkan::glslc)
 
 	message(STATUS "${PROJECT_NAME}: Fetching OpenXR...")
-	add_subdirectory(deps/OpenXR-SDK)
+	add_subdirectory(deps/OpenXR-SDK EXCLUDE_FROM_ALL)
 
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 	set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
 
 	message(STATUS "${PROJECT_NAME}: Fetching OGG...")
-	add_subdirectory(deps/ogg)
+	add_subdirectory(deps/ogg EXCLUDE_FROM_ALL)
 
 	message(STATUS "${PROJECT_NAME}: Fetching Vorbis...")
-	add_subdirectory(deps/vorbis)
+	add_subdirectory(deps/vorbis EXCLUDE_FROM_ALL)
 endFunction()

system/linux/linux_wayland.c

@@ -87,10 +87,6 @@ static void handleShellSurfaceConfigure(void *data, struct xdg_surface *shellSur
 
 static void handleToplevelConfigure(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height, struct wl_array *states)
 {
-    if(width!=0&&height!=0)
-    {
-        printf("%d %d", width, height);
-    }
 }
 
 static void handleToplevelClose(void *data, struct xdg_toplevel *toplevel)