diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 51 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/gpg/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 4 |
4 files changed, 26 insertions, 48 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b5b6850..10ea2766 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,23 +112,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Check Env Variables Before Configuring -if (CMAKE_BUILD_TYPE) - message(STATUS "PreCheck CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}") -else () +if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") - message(STATUS "Set CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}") endif () # Specify different compilation modes if (GPGFRONTEND_BUILD_CONFIG) # Test Build if (${GPGFRONTEND_BUILD_CONFIG} STREQUAL "test_core") - message(STATUS "Switch TEST_CORE_BUILD") + message(STATUS "Switch Build Configure TEST_CORE_BUILD") set(TEST_CORE_BUILD 1) set(AppName GpgFrontendCoreTest) # Test Build With Coverage Test elseif (${GPGFRONTEND_BUILD_CONFIG} STREQUAL "test_core_coverage") - message(STATUS "Switch TEST_COVERAGE_BUILD") + message(STATUS "Switch Build Configure TEST_COVERAGE_BUILD") set(TEST_CORE_BUILD 1) if (USING_COMPILER_CLANG OR USING_COMPILER_GCC) set(TEST_COVERAGE_BUILD 1) @@ -140,35 +137,26 @@ if (GPGFRONTEND_BUILD_CONFIG) set(AppName GpgFrontendTest) # Test Build with minimum UI elseif (${GPGFRONTEND_BUILD_CONFIG} STREQUAL "test_ui") - message(STATUS "Switch TEST_MINIMUM_UI_BUILD") + message(STATUS "Switch Build Configure TEST_MINIMUM_UI_BUILD") set(MINIMUM_APPLICATION_BUILD 1) set(AppName GpgFrontend) elseif (${GPGFRONTEND_BUILD_CONFIG} STREQUAL "test_all") - message(STATUS "Switch FULL_APPLICATION_BUILD") + message(STATUS "Switch Build Configure FULL_APPLICATION_BUILD") set(FULL_APPLICATION_BUILD 1) set(AppName GpgFrontend) endif () else () - message(STATUS "Switch Default STABLE_APPLICATION_BUILD") + message(STATUS "Switch Build Configure STABLE_APPLICATION_BUILD") set(STABLE_APPLICATION_BUILD 1) set(AppName GpgFrontend) endif () -if (EXECUTABLE_OUTPUT_PATH) - message(STATUS "PreCheck EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}") -else () - set(EXECUTABLE_OUTPUT_PATH "./") - message(STATUS "Set EXECUTABLE_OUTPUT_PATH ${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") set(BUILD_FLAG 0) ADD_DEFINITIONS(-DRELEASE) - message(STATUS "Build Type RELEASE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") # Release Version force to build using option STABLE_APPLICATION_BUILD set(FULL_APPLICATION_BUILD 0) @@ -176,7 +164,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Release") else () set(BUILD_FLAG 1) ADD_DEFINITIONS(-DDEBUG) - message(STATUS "Build Type DEBUG") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g") # Generate branch coverage information using gcc if (TEST_COVERAGE_BUILD) @@ -218,12 +205,12 @@ set(BUILD_VERSION ${PROJECT_VERSION}_${CMAKE_SYSTEM}_${CMAKE_SYSTEM_PROCESSOR}_$ set(GIT_VERSION ${GIT_BRANCH_NAME}_${GIT_COMMIT_HASH}) string(TIMESTAMP BUILD_TIMESTAMP "%Y-%m-%d %H:%M:%S") -message(STATUS "Build Timestamp ${BUILD_TIMESTAMP}") -message(STATUS "Build Version ${BUILD_VERSION}") -message(STATUS "Git Version ${GIT_VERSION}") +message(STATUS "GpgFrontend Build Timestamp ${BUILD_TIMESTAMP}") +message(STATUS "GpgFrontend Build Version ${BUILD_VERSION}") +message(STATUS "GpgFrontend Git Repo Version ${GIT_VERSION}") IF (MINGW) - message(STATUS "Configuration For OS Platform Microsoft Windows") + message(STATUS "GpgFrontend Configuration For OS Platform Microsoft Windows") message(STATUS "Build Environment MINGW") set(OS_PLATFORM 0) @@ -242,7 +229,7 @@ IF (MINGW) endif () if (APPLE) - message(STATUS "Configuration For OS Platform MacOS") + message(STATUS "GpgFrontend Configuration For OS Platform MacOS") set(OS_PLATFORM 1) ADD_DEFINITIONS(-DMACOS) @@ -274,7 +261,7 @@ endif () if (LINUX) - message(STATUS "Configuration For OS Platform LINUX") + message(STATUS "GpgFrontend Configuration For OS Platform LINUX") set(OS_PLATFORM 2) ADD_DEFINITIONS(-DLINUX) @@ -300,19 +287,12 @@ if (LINUX) endif () -message(STATUS "OS_PLATFORM ${OS_PLATFORM}") - if (GPG_STANDALONE_MODE) add_compile_definitions(GPG_STANDALONE_MODE) endif () -# Basic Environment Configure -set(BASIC_ENV_CONFIG 1) -set(QT_MOC_CONFIG 1) -set(EASY_LOGGING_PP 1) - if (LINUX_INSTALL_SOFTWARE) - message(STATUS "LINUX_INSTALL_SOFTWARE ON") + message(STATUS "Configure Linux Install ON") include(GNUInstallDirs) set(INSTALL_GPGFRONTEND_APP 1) set(APP_INSTALL_FLAG LINUX_INSTALL) @@ -323,6 +303,10 @@ else () add_compile_definitions(BUNDLE_BUILD) endif () +# Basic Environment Configure +set(BASIC_ENV_CONFIG 1) +set(QT_MOC_CONFIG 1) +set(EASY_LOGGING_PP 1) if (FULL_APPLICATION_BUILD) message(STATUS "Build Full Application") @@ -382,7 +366,6 @@ if (QT5_ENV_SUPPORT) set(CMAKE_AUTORCC_OPTIONS "--compress;9") set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_SOURCE_DIR}/ui) - message(STATUS "CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS}") endif () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67d8f884..25c1a8bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,7 +38,6 @@ if (APPLICATION_BUILD) # Set Binary Output Path set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}) endif () - message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") endif () @@ -56,7 +55,6 @@ if (APPLICATION_BUILD) else () set(RESOURCE_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif () - message(STATUS "RESOURCE_OUTPUT_DIRECTORY ${RESOURCE_OUTPUT_DIRECTORY}") endif () # Get ALL SOURCE FILES @@ -71,7 +69,6 @@ if (MULTI_LANG_SUPPORT) FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext) set(LOCALE_OUTPUT_PATH ${RESOURCE_OUTPUT_DIRECTORY}/locales) - message(STATUS "LOCALE_OUTPUT_PATH ${LOCALE_OUTPUT_PATH}") if (NOT GETTEXT_MSGFMT_EXECUTABLE OR NOT GETTEXT_XGETTEXT_EXECUTABLE) message(ERROR "msgfmt or xgettext not found. Translations will *not* be installed") @@ -86,12 +83,11 @@ if (MULTI_LANG_SUPPORT) file(GLOB ALL_PO_FILES ${CMAKE_SOURCE_DIR}/resource/locale/po/*.po) SET(GMO_FILES) - message(STATUS "ALL_PO_FILES ${ALL_PO_FILES}") foreach (_poFile ${ALL_PO_FILES}) GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME) string(REGEX REPLACE "\\.[^.]*$" "" _langName ${_poFileName}) - message(STATUS "_poFileName ${_langName}") + message(STATUS "GNU gettext po file ${_langName}") make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales) make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales/${_langName}/LC_MESSAGES) add_custom_command( @@ -249,7 +245,6 @@ if (APPLICATION_BUILD) set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui gpg_core ${GPGFRONTEND_BEFORE_UI_LIBS} easy_logging_pp) set(QT_DEPENDENCY_LIBS Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) - message(STATUS "Boost Libraries ${Boost_LIBRARIES}") IF (MINGW) message(STATUS "Link Application Static Library For MINGW") @@ -304,12 +299,11 @@ if (LINUX_INSTALL_SOFTWARE) DESTINATION /usr/share/icons/hicolor/) endif () if (MULTI_LANG_SUPPORT) - message(STATUS "Local Output Path ${LOCALE_OUTPUT_PATH}") install(DIRECTORY ${LOCALE_OUTPUT_PATH}/ DESTINATION ${CMAKE_INSTALL_FULL_LOCALEDIR}) endif () if (APP_PACKAGE_DEB) - message(STATUS "APP_PACKAGE_DEB ON") + message(STATUS "Configure Deb Package") SET(CPACK_GENERATOR "DEB") set(CPACK_INSTALL_PREFIX "/usr/local/") set(CPACK_PACKAGE_NAME "gpgfrontend") @@ -326,3 +320,6 @@ if (LINUX_INSTALL_SOFTWARE) endif () endif () +message(STATUS "Resource Files: ${RESOURCE_OUTPUT_DIRECTORY}") +message(STATUS "Locale Files: ${LOCALE_OUTPUT_PATH}") +message(STATUS "Runtime Files: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt index 0ccc8171..e651f541 100644 --- a/src/gpg/CMakeLists.txt +++ b/src/gpg/CMakeLists.txt @@ -10,14 +10,12 @@ set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils) set(GPGME_LIB_DIR ${UTILS_DIR}/gpgme/lib) if (EASY_LOGGING_PP) - message(STATUS "Link EASY_LOGGING_PP") - set(THIRD_PARTY_LIBS easy_logging_pp config++) + set(THIRD_PARTY_LIBS easy_logging_pp) endif () +set(THIRD_PARTY_LIBS "${THIRD_PARTY_LIBS} config++") set(BOOST_LIBS Boost::date_time Boost::filesystem) -message(STATUS "Third Party Libraries " ${THIRD_PARTY_LIBS}) - if (MINGW) message(STATUS "Link GPG Static Library For MINGW") target_link_libraries(gpg_core ${THIRD_PARTY_LIBS} diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 01e8c2ca..874fe37f 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -1,10 +1,10 @@ if (EASY_LOGGING_PP) - message(STATUS "Build easyloggingpp") + message(STATUS "Build dependency easyloggingpp") add_subdirectory(easyloggingpp) endif () if (APP_IMAGE_UPDATE) - message(STATUS "Build AppImageUpdate") + message(STATUS "Build dependency AppImageUpdate") set(USE_SYSTEM_BOOST 1) set(USE_SYSTEM_XZ 1) set(USE_SYSTEM_SQUASHFUSE 1) |