From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 10 Jan 2022 17:48:31 +0000 (+0100)
Subject: cpack nsis
X-Git-Tag: v0.3.0-beta~30
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=0386e6344ec1f47fe65444cca9627e236dcbfe9a;p=jp%2Fvkvg.git

cpack nsis
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b58aff..43f645c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,11 +117,11 @@ ENDIF ()
 
 FIND_PACKAGE(Vulkan REQUIRED)
 
-FIND_PACKAGE(Freetype)
-FIND_PACKAGE(Fontconfig)
-FIND_PACKAGE(HarfBuzz)
-FIND_PACKAGE(GLFW3)
-FIND_PACKAGE(Doxygen)
+FIND_PACKAGE(Freetype QUIET)
+FIND_PACKAGE(Fontconfig QUIET)
+FIND_PACKAGE(HarfBuzz QUIET)
+FIND_PACKAGE(GLFW3 QUIET)
+FIND_PACKAGE(Doxygen QUIET)
 
 CMAKE_DEPENDENT_OPTION(VKVG_USE_FREETYPE	"use freetype to load and render font glyphs" ON "Freetype_FOUND" OFF)
 CMAKE_DEPENDENT_OPTION(VKVG_USE_FONTCONFIG	"use FontConfig to resolve font names" ON "Fontconfig_FOUND" OFF)
@@ -217,11 +217,6 @@ ENDIF()
 CONFIGURE_FILE(vkvg.pc.in vkvg.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vkvg.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
 
-add_custom_target(print
-	${CMAKE_COMMAND} -E echo "$<$<BOOL:${VKVG_USE_FONTCONFIG}>:${Fontconfig_LIBRARIES}>"
-)
-
-
 FUNCTION (setup_lib LibName)
 	LIST (APPEND VKVG_TARGETS ${LibName})
 
@@ -275,11 +270,6 @@ FUNCTION (setup_lib LibName)
 			${Vulkan_LIBRARIES}
 			vkh
 	)
-
-	INSTALL(TARGETS "${LibName}"
-		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 ENDFUNCTION(setup_lib)
 
 GET_DIRECTORY_PROPERTY (vkvg_has_root_project PARENT_DIRECTORY)
@@ -319,6 +309,13 @@ ELSE()
 	SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE OFF)
 	setup_lib ("${PROJECT_NAME}_static")
 
+	INSTALL(TARGETS "${PROJECT_NAME}_shared" "${PROJECT_NAME}_static"
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+
 	IF (VKVG_BUILD_TESTS)
 		ADD_SUBDIRECTORY(tests)
 	ELSEIF (VKVG_BUILD_OFFSCREEN_TEST)
@@ -389,12 +386,7 @@ ELSE()
 	ENDIF (VKVG_BUILD_DOCS)
 
 	IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
-		INCLUDE(InstallRequiredSystemLibraries)
-
-		set(CPACK_ADD_LDCONFIG_CALL 1)
-		SET(CPACK_SET_DESTDIR "on")
-		SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp")
-		SET(CPACK_GENERATOR "DEB")
+		SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 
 		SET(CPACK_PACKAGE_DESCRIPTION "Vulkan vector graphic library")
 		SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "2d vector drawing library using vulkan")
@@ -407,14 +399,27 @@ ELSE()
 		SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 		SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
+		SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
+		INCLUDE(InstallRequiredSystemLibraries)
+		#SET(CPACK_COMPONENTS_ALL Libraries ApplicationData)
 		#dependencies for this service menu
-		SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libharfbuzz-gobject0 , libfontconfig1 , libfreetype6 ")
+		IF(UNIX)
+			SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp")
+			SET(CPACK_SET_DESTDIR "on")
+			SET(CPACK_ADD_LDCONFIG_CALL 1)
+			SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libharfbuzz-gobject0 , libfontconfig1 , libfreetype6 ")
+			SET(CPACK_GENERATOR "DEB")
+
+			SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+			SET(CPACK_DEBIAN_PACKAGE_SECTION "libraries")
+			SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+
+		ELSEIF (MSVC)
+			SET(CPACK_GENERATOR NSIS)
+			SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${PROJECT_NAME})
+			SET(CPACK_NSIS_MODIFY_PATH "ON")
 
-		SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-		SET(CPACK_DEBIAN_PACKAGE_SECTION "libraries")
-		SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CPACK_COMPONENTS_ALL Libraries ApplicationData)
+		ENDIF ()
 
 
 		INCLUDE(CPack)
@@ -430,9 +435,9 @@ IF (SHADERS_H)
 ENDIF ()
 
 IF (BUILD_SHARED_LIBS)
-	MESSAGE(STATUS  "Build Shared library.")
+	MESSAGE(STATUS "Library type\t\t= Shared.")
 ELSE ()
-	MESSAGE(STATUS "Build Static library.")
+	MESSAGE(STATUS "Library type\t\t= Static.")
 ENDIF ()
 
 MESSAGE(STATUS "VKVG version\t\t= ${vkvg_VERSION_MAJOR}.${vkvg_VERSION_MINOR}.${vkvg_VERSION_PATCH}")
diff --git a/vkh b/vkh
index 661caa9..bf7efaa 160000
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 661caa9f99524df30b76fda45309f73a04cd3cfb
+Subproject commit bf7efaa03f43641fd6780d1429dabb2d0df54f02