diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/gpg/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38d9ad70..dadb488f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,18 +138,18 @@ endif(CCACHE_FOUND) # detect compiler if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # using clang - message(STATUS "Using Complier Clang") + message(STATUS "Using Compiler clang") set(USING_COMPILER_CLANG 1) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # using gcc - message(STATUS "Using Complier Gcc") + message(STATUS "Using Compiler gcc") set(USING_COMPILER_GCC 1) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # using Intel C++ - message(STATUS "Using Complier Intel") + message(STATUS "Using Compiler Intel") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # using Visual Studio C++ - message(STATUS "Using Complier Msvc") + message(STATUS "Using Compiler MSVC") endif () # Using Standard C++-17 (Consider compatibility) @@ -216,7 +216,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Release") else () set(BUILD_FLAG 1) ADD_DEFINITIONS(-DDEBUG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") # Generate branch coverage information using gcc if (TEST_COVERAGE_BUILD) if (USING_COMPILER_GCC) diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt index ac8896fb..9567f636 100644 --- a/src/gpg/CMakeLists.txt +++ b/src/gpg/CMakeLists.txt @@ -35,13 +35,15 @@ set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils) set(GPGME_LIB_DIR ${UTILS_DIR}/gpgme/lib) # link third-party libraries -target_link_libraries(gpgfrontend_core easyloggingpp config++ archive_static) +target_link_libraries(gpgfrontend_core easyloggingpp config++) # link boost libraries target_link_libraries(gpgfrontend_core Boost::date_time Boost::filesystem) # link gnupg libraries target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) # link openssl target_link_libraries(gpgfrontend_core OpenSSL::SSL OpenSSL::Crypto) +#link libarchive +target_link_libraries(gpgfrontend_core archive_static) # set up pch target_precompile_headers(gpgfrontend_core PUBLIC ${CMAKE_SOURCE_DIR}/src/GpgFrontend.h) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index c2869f84..138c649d 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -206,4 +206,5 @@ aux_source_directory(./encoding-detect ENCODING_DETECT_SOURCE_CODE) add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE}) # libarchive +remove_definitions(-DDEBUG) add_subdirectory(libarchive)
\ No newline at end of file |