Silence ccache and clang warnings (#2209)

This commit is contained in:
Teddy Reed 2016-06-30 18:41:32 -07:00 committed by GitHub
parent 1f9739eed4
commit ca3cc5cf03
2 changed files with 12 additions and 19 deletions

View File

@ -27,6 +27,7 @@ find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
LOG("Found ccache ${CCACHE_FOUND}")
LOG("Using ccache to speed up compilation")
set(ENV{CCACHE_CPP2} "yes")
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif(CCACHE_FOUND)
@ -35,6 +36,7 @@ if(WIN32)
# TODO(#1985): We need to find the MSVC equivalents to the flags listed in the else section.
else()
add_compile_options(
-Qunused-arguments
-Wstrict-aliasing
-Wno-missing-field-initializers
-Wno-unused-local-typedef
@ -166,7 +168,7 @@ if(DEFINED ENV{DEBUG})
# TODO(#1985): Is there a MSVC flag congruent to -fstandalone-debug?
add_compile_options(
/Zi
/Od
/Od
)
else()
add_compile_options(
@ -178,9 +180,6 @@ if(DEFINED ENV{DEBUG})
add_definitions(-DDEBUG)
WARNING_LOG("Setting DEBUG build")
elseif(DEFINED ENV{SANITIZE})
# TODO(#1985): In the future, we need to find the MSVC equivalent flags for the following
# compiler flags.
# make sanitize (cannot make debug sanitize)
add_compile_options(
-g
@ -215,11 +214,8 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if(NOT DEFINED ENV{OPTIMIZED})
# TODO(#1985): Is there a congruent flag in MSVC for -mno-avx flag? I think it is implicit that the default
# does not use avx. Ideally, this should be kept WIN64 only but we are having trouble determining
# the target architecture
if(WIN32)
# TODO: Add something here?
# It is unclear if AVX must be managed on Windows.
else()
add_compile_options(-march=x86-64 -mno-avx)
endif()
@ -371,13 +367,10 @@ endif()
set(MKDIR_OPTS "")
if(WIN32)
set(PROCESS_FAMILY "windows")
set(WINDOWS_DEP_DIR "$ENV{ChocolateyInstall}/lib")
string(REGEX REPLACE "\\\\" "/" WINDOWS_DEP_DIR ${WINDOWS_DEP_DIR})
set(BOOST_DEP_DIR "$ENV{HOMEDRIVE}/local/boost-msvc14")
# TODO(#1988): All the paths used here are within third-party\. However, after chocolateyfication, these
# paths are subject to change.
# Win64 specific BZIP2 variables
set(BZIP2_INCLUDE_DIR "${WINDOWS_DEP_DIR}/bzip2/local/include")
@ -390,16 +383,16 @@ if(WIN32)
set(OPENSSL_SSL_LIBRARY "${WINDOWS_DEP_DIR}/openssl/local/lib/ssleay32.lib")
set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
set(OPENSSL_USE_STATIC_LIBS TRUE)
# Win64 specific Thrift
set(THRIFT_INCLUDE_DIR "${WINDOWS_DEP_DIR}/thrift-dev/local/include")
set(thrift_library "${WINDOWS_DEP_DIR}/thrift-dev/local/lib/thriftmd.lib")
set(THRIFT_COMPILER "${WINDOWS_DEP_DIR}/thrift/tools/thrift.exe")
# Win64 specific rocksdb
set(ROCKSDB_STATIC_LIBRARY "${WINDOWS_DEP_DIR}/rocksdb/local/lib/rocksdblib.lib")
set(ROCKSDB_SNAPPY_LIBRARY "${WINDOWS_DEP_DIR}/snappy-msvc/tools/snappy-windows-1.1.1.8/native/snappy64.lib")
# Win64 specific doxygen
set(DOXYGEN_EXECUTABLE "${WINDOWS_DEP_DIR}/doxygen/tools/doxygen.exe")
@ -410,10 +403,10 @@ if(WIN32)
# Win64 specific gflags
set(gflags_library "${WINDOWS_DEP_DIR}/gflags-dev/local/lib/gflags_static.lib")
# Win64 specific glog
set(glog_library "${WINDOWS_DEP_DIR}/glog/local/lib/glog.lib")
# Win64 specific cpp-netlib library
set(cppnetlib-uri_library "${WINDOWS_DEP_DIR}/cpp-netlib/local/lib/cppnetlib-uri.lib")
set(cppnetlib-client-connections_library "${WINDOWS_DEP_DIR}/cpp-netlib/local/lib/cppnetlib-client-connections.lib")
@ -422,7 +415,7 @@ else()
set(MKDIR_OPTS "-p")
endif()
# Make sure the generated paths exist
# Make sure the generated paths exist
execute_process(COMMAND mkdir ${MKDIR_OPTS} "${CMAKE_BINARY_DIR}/generated")
# We need to link some packages as dynamic/dependent.

@ -1 +1 @@
Subproject commit 1aad215e8bf841bc8ed6321432dd3b1cb0fc7af1
Subproject commit f4eeaf26a5368d704c71f9a32fee57a5c5ac89d1