diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b0cdf42..965aedc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(dbus) # we need to be up to date -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) +cmake_minimum_required(VERSION 3.4 FATAL_ERROR) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif() @@ -220,8 +220,8 @@ if(MSVC) set(GROUP_CODE flat) endif() add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /FIconfig.h") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /FIconfig.h") + string(APPEND CMAKE_C_FLAGS_DEBUG " /FIconfig.h") + string(APPEND CMAKE_C_FLAGS_RELEASE " /FIconfig.h") option(DBUS_MSVC_ANALYZE "Enable code analyzing for MSVC compiler: /analyze" OFF) endif() @@ -236,13 +236,13 @@ if(MSVC) if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") + string(APPEND CMAKE_CXX_FLAGS " /W4") endif() if(CMAKE_C_FLAGS MATCHES "/W[0-4]") string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") + string(APPEND CMAKE_C_FLAGS " /W4") endif() else() set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING "warning level" FORCE) @@ -266,7 +266,7 @@ if(MSVC) # 4133 'type' : incompatible types - from 'type1' to 'type2' set(WARNINGS_C_ERRORS "4002 4003 4013 4028 4031 4047 4114 4133") if(DBUS_MSVC_ANALYZE AND MSVC_VERSION GREATER 1600) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze") + string(APPEND CMAKE_C_FLAGS " /analyze") endif() else() set(WARNINGS_C "sign-compare") @@ -284,19 +284,19 @@ else() endif() generate_warning_cflags(WARNINGS_CFLAGS "${WARNINGS_C}" "${WARNINGS_C_DISABLED}" "${WARNINGS_C_ERRORS}") generate_warning_cflags(WARNINGS_CXXFLAGS "${WARNINGS_CXX}" "${WARNINGS_CXX_DISABLED}" "${WARNINGS_CXX_ERRORS}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNINGS_CFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS_CXXFLAGS}") +string(APPEND CMAKE_C_FLAGS " ${WARNINGS_CFLAGS}") +string(APPEND CMAKE_CXX_FLAGS " ${WARNINGS_CFLAGS}") # let wine be able to show file and lines in backtrace if(DBUS_USE_WINE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gstabs") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gstabs") + string(APPEND CMAKE_C_FLAGS " -gstabs") + string(APPEND CMAKE_CXX_FLAGS " -gstabs") endif() if(UNIX AND NOT DBUS_DISABLE_ASSERT) # required for backtrace - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic") + string(APPEND CMAKE_C_FLAGS_DEBUG " -Wl,--export-dynamic") + string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Wl,--export-dynamic") set(DBUS_BUILT_R_DYNAMIC 1) endif() @@ -305,7 +305,7 @@ if(DBUS_WITH_GLIB) autodefine(GLIB_VERSION_MAX_ALLOWED) endif() -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") +string(APPEND CMAKE_C_FLAGS_DEBUG " -D_DEBUG") ######################################################################### # Windows CE (>= 5.0.0) |