* 修改编译方式为CMakev2.1.2-20191105

* 删除C++适配代码
* 修改编译告警

3 files changed, 84 insertions, 0 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
new file mode 100644
index 0000000..910ba97
--- /dev/null
+++ b/cmake/Package.cmake
@@ -0,0 +1,38 @@
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CPACK_PACKAGE_NAME "certostre-debug")
+else()
+    set(CPACK_PACKAGE_NAME "certostre")
+endif()
+
+message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+
+set(CPACK_PACKAGE_VENDOR "MESASOFT")
+set(CPACK_PACKAGE_VERSION_MAJOR "${TARGET_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${TARGET_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${TARGET_PATCH}.${TARGET_DESCRIBE}")
+set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+# RPM Build
+set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
+set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
+set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
+set(CPACK_RPM_DEBUGINFO_PACKAGE on)
+set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
+#set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
+#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
+#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
+
+# Must uninstall the debug package before install release package
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CPACK_RPM_PACKAGE_CONFLICTS "certostre")
+else()
+    set(CPACK_RPM_PACKAGE_CONFLICTS "certostre-debug")
+endif()
+
+# setup %config(noreplace)
+set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/cert_store.ini"
+							"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/table_info.conf"
+                            "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/pxy_obj_keyring.json")
+include(CPack)
diff --git a/cmake/PreInstall.in b/cmake/PreInstall.in
new file mode 100644
index 0000000..1c27cc9
--- /dev/null
+++ b/cmake/PreInstall.in
@@ -0,0 +1 @@
+systemctl stop sapp
\ No newline at end of file
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
new file mode 100644
index 0000000..ad6931f
--- /dev/null
+++ b/cmake/Version.cmake
@@ -0,0 +1,45 @@
+
+# Using autorevision.sh to generate version information
+
+set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
+set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
+set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
+set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
+
+file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}
+	FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+	WORLD_READ WORLD_EXECUTE)
+
+# execute autorevision.sh to generate version information
+execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPUT_FILE ${__VERSION_CONFIG})
+include(${__VERSION_CONFIG})
+
+# extract major, minor, patch version from git tag
+message(STATUS "Before, Version: ${VCS_TAG}")
+string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" TARGET_MAJOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" TARGET_MINOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" TARGET_PATCH "${VCS_TAG}")
+
+if(NOT TARGET_MAJOR)
+    set(TARGET_MAJOR 1)
+endif()
+
+if(NOT TARGET_MINOR)
+    set(TARGET_MINOR 0)
+endif()
+
+if(NOT TARGET_PATCH)
+    set(TARGET_PATCH 0)
+endif()
+
+set(TARGET_DESCRIBE "${VCS_SHORT_HASH}")
+set(TARGET_VERSION "${TARGET_MAJOR}.${TARGET_MINOR}.${TARGET_PATCH}-${TARGET_DESCRIBE}")
+set(TARGET_GIT_VERSION "${TARGET_MAJOR}.${TARGET_MINOR}.${TARGET_PATCH}-${TARGET_DESCRIBE}")
+
+# Replace .- with _
+string(REGEX REPLACE "[\\.\\-]" "_" TARGET_VAR_VERSION "${TARGET_GIT_VERSION}")
+
+# print information
+message(STATUS "Welcome to Certstore, Version: ${TARGET_VERSION}")
+add_definitions(-DTARGET_GIT_VERSION=\"${TARGET_GIT_VERSION}\")
+add_definitions(-DTARGET_VAR_VERSION=${TARGET_VAR_VERSION})