added cpack configuration, but ZIP not working yet

Author: Jan Wilmans

.gitignore

@@ -6,4 +6,5 @@ bin/
 packages/
 bin
 obj/
-Testing/
+Testing/
+install/

CMakeLists.txt

@@ -3,9 +3,15 @@ cmake_minimum_required(VERSION 3.16)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+include(CMakeLists.buildnumber)
+include(CMakeLists.nuget)
+
+MESSAGE("Building DebugViewpp version: ${DEBUGVIEW_VERSION}")
+
 project(
   debugviewpp
-  VERSION 0.0.1
+  VERSION ${DEBUGVIEW_VERSION}
   DESCRIPTION "DebugView++, collects, views, filters your application logs"
   HOMEPAGE_URL "https://github.com/CobaltFusion/DebugViewPP"
   LANGUAGES CXX C
@@ -24,9 +30,6 @@ endif()
 
 set(PROJECT_UTILS_DIRECTORY "${PROJECT_SOURCE_DIR}/utils")
 
-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-include(CMakeLists.nuget)
-
 add_library(project_definitions INTERFACE)
 add_library(project_compile_features INTERFACE)
 add_library(project_compile_options INTERFACE)
@@ -54,9 +57,6 @@ add_subdirectory(application)
 
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT Debugviewpp)
 
-# this include needs to be after all install() rules
-include(CPack)
-
 message("")
 message("configuration:        ${CMAKE_BUILD_TYPE}")
 message("will be built in:     ${CMAKE_BINARY_DIR}")

application/CMakeLists.txt

@@ -8,4 +8,15 @@ add_subdirectory(DebugViewConsole)
 add_subdirectory(GDIGraphicsPOC)
 add_subdirectory(IndexedStorageLib)
 add_subdirectory(Win32Lib)
-add_subdirectory(Libraries)
+add_subdirectory(Libraries EXCLUDE_FROM_ALL)
+
+set(CPACK_PACKAGE_CONTACT "janwilmans@gmail.com")
+set(CPACK_PACKAGE_VERSION "${DEBUGVIEW_VERSION}")
+set(CPACK_DEBIAN_PACKAGE_RELEASE "December 2022")
+set(CPACK_PACKAGING_INSTALL_PREFIX "debugviewpp")
+set(CPACK_GENERATOR "ZIP")
+set(CPACK_DEB_COMPONENT_INSTALL OFF)
+set(CPACK_MONOLITHIC_INSTALL ON)
+
+# this include needs to be after all install() rules
+include(CPack)

application/DebugViewConsole/CMakeLists.txt

@@ -1,8 +1,8 @@
 project(DebugViewConsole)
 
-add_executable(${PROJECT_NAME} DebugViewConsole.cpp)
+add_executable(DebugViewConsole DebugViewConsole.cpp)
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(DebugViewConsole
 	PRIVATE
         project::definitions
         project::compile_features
@@ -14,6 +14,13 @@ target_link_libraries(${PROJECT_NAME}
 		docopt
 )
 
-target_include_directories(${PROJECT_NAME} PUBLIC
+install(TARGETS DebugViewConsole RUNTIME DESTINATION debugviewpp)
+
+target_include_directories(DebugViewConsole PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
+
+get_property(EXE_NAME TARGET DebugViewConsole PROPERTY TARGET_FILE_NAME)
+add_custom_command(TARGET DebugViewConsole POST_BUILD COMMAND ${PROJECT_UTILS_DIRECTORY}/upx.exe --best $<TARGET_FILE:DebugViewConsole>)
+
+# CPACK_ARCHIVE_FILE_NAME

application/DebugViewpp/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(Debugviewpp)
 
-add_executable(${PROJECT_NAME}
+add_executable(Debugviewpp
     AboutDlg.cpp
     CLogViewTabItem2.cpp
     DebugView++.cpp
@@ -21,7 +21,7 @@ add_executable(${PROJECT_NAME}
     DebugView++.rc
  )
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(Debugviewpp
     PRIVATE
         project::definitions
         project::compile_features
@@ -38,8 +38,12 @@ target_link_libraries(${PROJECT_NAME}
         fmt::fmt
 )
 
-target_include_directories(${PROJECT_NAME} PUBLIC
+install(TARGETS Debugviewpp RUNTIME DESTINATION debugviewpp)
+
+target_include_directories(Debugviewpp PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
 
-add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND echo test ${PROJECT_UTILS_DIRECTORY}/upx.exe ${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
+get_property(EXE_NAME TARGET Debugviewpp PROPERTY TARGET_FILE_NAME)
+add_custom_command(TARGET Debugviewpp POST_BUILD COMMAND  ${PROJECT_UTILS_DIRECTORY}/upx.exe --best $<TARGET_FILE:Debugviewpp>)
+

cmake/CMakeLists.buildnumber.cmake

@@ -0,0 +1,17 @@
+# Set the initial build number
+set(BUILD_NUMBER 0)
+
+# Check if the build number file exists
+if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/build_number.txt)
+  # If it exists, read the current build number from the file
+  file(READ ${CMAKE_SOURCE_DIR}/cmake/build_number.txt BUILD_NUMBER)
+endif()
+
+# Increment the build number
+math(EXPR BUILD_NUMBER "${BUILD_NUMBER} + 1")
+
+# Write the updated build number to the file
+file(WRITE ${CMAKE_SOURCE_DIR}/cmake/build_number.txt ${BUILD_NUMBER})
+
+# Set the build number as a CMake variable
+set(DEBUGVIEW_VERSION "1.9.0.${BUILD_NUMBER}" CACHE INTERNAL "")

cmake/build_number.txt

@@ -0,0 +1 @@
+16