diff options
-rw-r--r-- | libs/libmdbx/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | plugins/Db3x_mmap/CMakeLists.txt | 2 | ||||
-rw-r--r-- | protocols/Telegram/tdlib/td/CMake/AddCXXCompilerFlag.cmake | 4 | ||||
-rw-r--r-- | src/mir_app/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/libmdbx/src/CMakeLists.txt b/libs/libmdbx/src/CMakeLists.txt index 46afa66fca..b0a1d4604d 100644 --- a/libs/libmdbx/src/CMakeLists.txt +++ b/libs/libmdbx/src/CMakeLists.txt @@ -355,7 +355,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND EXISTS "${MDBX_SOURCE_DIR}/ntdll. if(NOT MSVC_LIB_EXE) # Find lib.exe get_filename_component(CL_NAME ${CMAKE_C_COMPILER} NAME) - string(REPLACE cl.exe lib.exe MSVC_LIB_EXE ${CL_NAME}) + string(REPLACE cl.exe lib.exe MSVC_LIB_EXE "${CL_NAME}") find_program(MSVC_LIB_EXE ${MSVC_LIB_EXE}) endif() if(MSVC_LIB_EXE) @@ -372,7 +372,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND EXISTS "${MDBX_SOURCE_DIR}/ntdll. if(NOT DLLTOOL) # Find dlltool get_filename_component(GCC_NAME ${CMAKE_C_COMPILER} NAME) - string(REPLACE gcc dlltool DLLTOOL_NAME ${GCC_NAME}) + string(REPLACE gcc dlltool DLLTOOL_NAME "${GCC_NAME}") find_program(DLLTOOL NAMES ${DLLTOOL_NAME}) endif() if(DLLTOOL) diff --git a/plugins/Db3x_mmap/CMakeLists.txt b/plugins/Db3x_mmap/CMakeLists.txt index d30807aa46..eaff420f7d 100644 --- a/plugins/Db3x_mmap/CMakeLists.txt +++ b/plugins/Db3x_mmap/CMakeLists.txt @@ -3,6 +3,6 @@ set(TARGET Dbx_mmap) # Just a workaround. Better to fix plugins that do not compile with this option. # Even Microsoft recommends to use standard exception handling. -string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
\ No newline at end of file diff --git a/protocols/Telegram/tdlib/td/CMake/AddCXXCompilerFlag.cmake b/protocols/Telegram/tdlib/td/CMake/AddCXXCompilerFlag.cmake index 6fb615a1f7..2162dadb26 100644 --- a/protocols/Telegram/tdlib/td/CMake/AddCXXCompilerFlag.cmake +++ b/protocols/Telegram/tdlib/td/CMake/AddCXXCompilerFlag.cmake @@ -21,14 +21,14 @@ include(CheckCXXCompilerFlag) function(mangle_compiler_flag FLAG OUTPUT) string(TOUPPER "HAVE_CXX_FLAG_${FLAG}" SANITIZED_FLAG) - string(REPLACE "+" "X" SANITIZED_FLAG ${SANITIZED_FLAG}) + string(REPLACE "+" "X" SANITIZED_FLAG "${SANITIZED_FLAG}") string(REGEX REPLACE "[^A-Za-z_0-9]" "_" SANITIZED_FLAG ${SANITIZED_FLAG}) string(REGEX REPLACE "_+" "_" SANITIZED_FLAG ${SANITIZED_FLAG}) set(${OUTPUT} "${SANITIZED_FLAG}" PARENT_SCOPE) endfunction(mangle_compiler_flag) function(add_cxx_compiler_flag FLAG) - string(REPLACE "-Wno-" "-W" MAIN_FLAG ${FLAG}) + string(REPLACE "-Wno-" "-W" MAIN_FLAG "${FLAG}") mangle_compiler_flag("${MAIN_FLAG}" MANGLED_FLAG_NAME) if (DEFINED CMAKE_REQUIRED_FLAGS) set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") diff --git a/src/mir_app/CMakeLists.txt b/src/mir_app/CMakeLists.txt index b9ec24be6b..fdc52ea1e6 100644 --- a/src/mir_app/CMakeLists.txt +++ b/src/mir_app/CMakeLists.txt @@ -5,7 +5,7 @@ else() list(APPEND SOURCES "src/mir_app.def") endif() set(TARGET mir_app) -string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake) target_link_libraries(${TARGET} Zlib FreeImage UxTheme.lib ws2_32.lib ${PREBUILT_DIR}/mir_core.lib ${PREBUILT_DIR}/libcrypto.lib) set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MIR_APP_EXPORTS")
\ No newline at end of file |