diff options
| author | Saturneric <[email protected]> | 2021-06-20 07:40:14 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-06-20 07:40:14 +0000 |
| commit | 770c2281a67ab83189936a3d69606592da9f588f (patch) | |
| tree | 37c79ea5c4898f53b1db6452f7bd102b5b3c1fcd | |
| parent | Update cmake.yml (diff) | |
| parent | Delete .travis.yml. (diff) | |
| download | GpgFrontend-770c2281a67ab83189936a3d69606592da9f588f.tar.gz GpgFrontend-770c2281a67ab83189936a3d69606592da9f588f.zip | |
Merge branch 'feature/ci' into main
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | include/GpgFrontend.h | 8 |
2 files changed, 20 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 163b03ea..11d85685 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,17 +4,32 @@ project(GpgFrontend VERSION 1.0.0 LANGUAGES CXX) message(STATUS "GPGFrontend Build Configuration Started CMAKE Version ${CMAKE_VERSION}") +# C++ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +# Qt set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +# Check Env Variables Before Configuring + +if(NOT DEFINED ENV{CMAKE_BUILD_TYPE}) + set(CMAKE_BUILD_TYPE "Release") +endif() + +if(NOT DEFINED ENV{EXECUTABLE_OUTPUT_PATH}) + set(EXECUTABLE_OUTPUT_PATH "./") +endif() + +# Output Env Variables +message(STATUS "Define EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}") +message(STATUS "Define CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}") if(${CMAKE_BUILD_TYPE} STREQUAL "Release") message(STATUS "Build Type RELEASE") diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h index 156709d9..22a55826 100644 --- a/include/GpgFrontend.h +++ b/include/GpgFrontend.h @@ -18,15 +18,15 @@ #define PROJECT_NAME "GpgFrontend" #define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Release" -#define GIT_VERSION "main_edf08cf137e47ab9e61f5f088cef94cdbeca2c6e" +#define GIT_VERSION "feature/ci_a2da66e1f95d06b9c97182f611f0019fae871c02" #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define BUILD_TIMESTAMP "2021-06-19 20:12:57" +#define BUILD_TIMESTAMP "2021-06-20 14:52:25" -#define GIT_BRANCH_NAME "main" -#define GIT_COMMIT_HASH "edf08cf137e47ab9e61f5f088cef94cdbeca2c6e" +#define GIT_BRANCH_NAME "feature/ci" +#define GIT_COMMIT_HASH "a2da66e1f95d06b9c97182f611f0019fae871c02" #endif //GPGFRONTEND_H_IN |