cmake: refactoring; create archive as result of build

Author: ctapmex

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(Calculator CXX C)
+project(Calculator)
 
 #====================================================
 # Enable policy
@@ -13,43 +13,40 @@ cmake_policy(SET CMP0091 NEW)
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type, one of: Release, Debug" FORCE)
 endif ()
-message("Build type for Calculator: ${CMAKE_BUILD_TYPE}")
+message("Build type for ${PROJECT_NAME}: ${CMAKE_BUILD_TYPE}")
+
+#====================================================
+# Set configuration types
+#====================================================
+if(NOT MSVC_IDE)
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+else()
+  #target_compile_options cannot set parameters for all configurations in MSVC
+  set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE STRING "" FORCE)
+endif()
+message("Configurations for IDE: ${CMAKE_CONFIGURATION_TYPES}")
 
 # check platform for build
 set(IS_x64_PLATFORM FALSE CACHE BOOL "" FORCE)
 if ("$ENV{PLATFORM}" MATCHES "x64")
   set(IS_x64_PLATFORM TRUE CACHE BOOL "" FORCE)
 endif ()
 
-# Get plugin version from src/plugcalc/version.h and put it in PLUGIN_VERSION
-function(plugin_extract_version)
-  file(READ "${CMAKE_CURRENT_LIST_DIR}/src/plugcalc/version.h" file_contents)
-  string(REGEX MATCH "PLUGIN_VER_MAJOR ([0-9]+)" _ "${file_contents}")
-  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
-    message(FATAL_ERROR "Could not extract major version number from version.hpp")
-  endif ()
-  set(ver_major ${CMAKE_MATCH_1})
-
-  string(REGEX MATCH "PLUGIN_VER_MINOR ([0-9]+)" _ "${file_contents}")
-  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
-    message(FATAL_ERROR "Could not extract minor version number from version.hpp")
-  endif ()
-
-  set(ver_minor ${CMAKE_MATCH_1})
-  string(REGEX MATCH "PLUGIN_VER_PATCH ([0-9]+)" _ "${file_contents}")
-  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
-    message(FATAL_ERROR "Could not extract patch version number from version.hpp")
-  endif ()
-  set(ver_patch ${CMAKE_MATCH_1})
-
-  set(PLUGIN_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
-endfunction()
+include(cmake/utils.cmake)
+plugin_extract_version(${CMAKE_CURRENT_LIST_DIR}/src/plugcalc/version.h)
+if (IS_x64_PLATFORM)
+  set(PACKAGE_FILE_NAME "${PROJECT_NAME}.${PLUGIN_VERSION}.x64")
+else ()
+  set(PACKAGE_FILE_NAME "${PROJECT_NAME}.${PLUGIN_VERSION}.x86")
+endif ()
 
-plugin_extract_version()
+#====================================================
+# build plugin
+#====================================================
 add_subdirectory(src)
 
 #====================================================
-# build misc files
+# build resource files
 #====================================================
 # used @@ESCAPE and ESCAPE@@ for escape @ in files
 configure_file(res/file_id.diz.in res/file_id.diz)
@@ -59,11 +56,24 @@ configure_file(res/calcr.hlf.in res/calcr.hlf)
 #====================================================
 # install
 #====================================================
+install(TARGETS Calculator RUNTIME DESTINATION .)
 install(DIRECTORY res/
     DESTINATION .
     PATTERN "*.in" EXCLUDE)
-install(FILES whatsnew_en.txt whatsnew_ru.txt
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/src/calc.map
     ${CMAKE_CURRENT_BINARY_DIR}/res/file_id.diz
     ${CMAKE_CURRENT_BINARY_DIR}/res/calce.hlf
     ${CMAKE_CURRENT_BINARY_DIR}/res/calcr.hlf
-    DESTINATION .)
+    whatsnew_en.txt
+    whatsnew_ru.txt
+    DESTINATION .)
+
+#====================================================
+# cpack
+#====================================================
+set(CPACK_GENERATOR "ZIP" CACHE STRING "Generators to support. semi-colon delimited list")
+set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME}")
+
+include(CPack)

cmake/utils.cmake

@@ -0,0 +1,22 @@
+function(plugin_extract_version path_to_version_file)
+  file(READ "${path_to_version_file}" file_contents)
+  string(REGEX MATCH "PLUGIN_VER_MAJOR ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract major version number from ${path_to_version_file}")
+  endif ()
+  set(ver_major ${CMAKE_MATCH_1})
+
+  string(REGEX MATCH "PLUGIN_VER_MINOR ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract minor version number from ${path_to_version_file}")
+  endif ()
+
+  set(ver_minor ${CMAKE_MATCH_1})
+  string(REGEX MATCH "PLUGIN_VER_PATCH ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract patch version number from ${path_to_version_file}")
+  endif ()
+  set(ver_patch ${CMAKE_MATCH_1})
+
+  set(PLUGIN_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
+endfunction()

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(Calculator CXX C)
+project(Calculator VERSION ${PLUGIN_VERSION} LANGUAGES CXX C)
 
 set(SRC_CPP
     plugcalc/api.cpp
@@ -58,15 +58,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   set(FLAGS_CXX_RELEASE /W3 /Oi /Ot /GL /GS- /Ob1 /GF /GR)
   set(FLAGS_CXX_DEBUG /W4 /GS)
 
-
   set(LINK_FLAGS "/MAP /MANIFEST:NO")
 
   # build with debug info in pdb
   if (CMAKE_BUILD_TYPE MATCHES "Release")
     set(LINK_FLAGS "${LINK_FLAGS} /incremental:no /OPT:REF /OPT:ICF /debug /ltcg")
   endif ()
 
-  add_definitions(-DUNICODE -D_UNICODE)
+  add_definitions(-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS -DTTMATH_RELEASE)
 
   if (IS_x64_PLATFORM)
     set(CMAKE_RC_FLAGS -D_WIN64)
@@ -75,8 +74,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     add_definitions(-DWINDOWS_IGNORE_PACKING_MISMATCH)
   endif ()
 
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS -DTTMATH_RELEASE)
-
 endif ()
 
 # set options for target
@@ -90,38 +87,38 @@ set(MAIN_FLAGS_C_RELEASE ${FLAGS_C_RELEASE} ${FLAGS_C_DEFAULT})
 #====================================================
 
 set(SRC_FILES ${SRC_CPP} ${SRC_DEF})
-add_library(Calculator SHARED ${SRC_FILES})
-target_include_directories(Calculator
+add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
+target_include_directories(${PROJECT_NAME}
     PRIVATE ./shared
     )
 
-set_target_properties(Calculator PROPERTIES
+set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_STANDARD 11
     CXX_STANDARD_REQUIRED YES
     CXX_EXTENSIONS NO
     )
 
 if (${CMAKE_BUILD_TYPE} MATCHES Debug)
-  target_compile_options(Calculator
+  target_compile_options(${PROJECT_NAME}
       PUBLIC $<$<COMPILE_LANGUAGE:C>:${MAIN_FLAGS_C_DEBUG}>
       PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${MAIN_FLAGS_CXX_DEBUG}>
       )
 else ()
-  target_compile_options(Calculator
+  target_compile_options(${PROJECT_NAME}
       PUBLIC $<$<COMPILE_LANGUAGE:C>:${MAIN_FLAGS_C_RELEASE}>
       PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${MAIN_FLAGS_CXX_RELEASE}>
       )
 endif ()
 
-set_target_properties(Calculator
+set_target_properties(${PROJECT_NAME}
     PROPERTIES
     LINK_FLAGS "${LINK_FLAGS}"
     OUTPUT_NAME "calc"
     )
 
-#====================================================
-# install
-#====================================================
-install(TARGETS Calculator RUNTIME DESTINATION .)
-install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> ${CMAKE_CURRENT_BINARY_DIR}/calc.map DESTINATION .)
-
+# create archive with pdb file
+add_custom_target(
+    ${PROJECT_NAME}_PDB ALL
+    COMMAND ${CMAKE_COMMAND} -E tar "cfv" "../${PACKAGE_FILE_NAME}.pdb.zip" --format=zip $<TARGET_PDB_FILE:${PROJECT_NAME}>
+    DEPENDS $<TARGET_PDB_FILE:${PROJECT_NAME}>
+)

vc.build.release.bat

@@ -11,7 +11,9 @@ if exist "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" (
 mkdir build
 cd build
 cmake .. -DCMAKE_INSTALL_PREFIX=../bin/x86 -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - NMake Makefiles"
-cmake --build . --target install 
+cmake --build .
+cpack
+copy *.zip ..\bin
 
 if errorlevel 1 goto end
 
@@ -24,7 +26,9 @@ if exist "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" (
 mkdir build64
 cd build64
 cmake .. -DCMAKE_INSTALL_PREFIX=../bin/x64 -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - NMake Makefiles"
-cmake --build . --target install 
+cmake --build .
+cpack
+copy *.zip ..\bin
 
 :end
 echo See result in directory "bin"