Skip to content

Commit 48a8923

Browse files
committed
all: Fix some compiler warnings
1 parent 4dc8898 commit 48a8923

File tree

16 files changed

+228
-316
lines changed

16 files changed

+228
-316
lines changed

CMakeLists.txt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# See https://www.wischik.com/lu/programmer/zip_utils.html
44

5-
cmake_minimum_required(VERSION 3.5)
5+
cmake_minimum_required(VERSION 3.10)
66
project(zip-utils LANGUAGES CXX)
77

88
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
@@ -259,16 +259,16 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
259259
endif (ZU_ENABLE_ASAN)
260260

261261
if (ZU_ENABLE_STATIC_MSVC_RUNTIME)
262-
# Use static runtime.
263-
foreach(flag_var
264-
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
265-
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
266-
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
267-
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
268-
if (${flag_var} MATCHES "/MD")
269-
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
270-
endif()
271-
endforeach()
262+
# Use static runtime.
263+
foreach(flag_var
264+
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
265+
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
266+
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
267+
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
268+
if (${flag_var} MATCHES "/MD")
269+
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
270+
endif()
271+
endforeach()
272272
endif (ZU_ENABLE_STATIC_MSVC_RUNTIME)
273273
else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
274274
# Use -Wall for clang and gcc.
@@ -373,20 +373,20 @@ endif(BUILD_SHARED_LIBS)
373373
if (ZU_ENABLE_UNIT_TESTS)
374374
enable_testing()
375375

376-
add_subdirectory(examples/modify)
376+
add_subdirectory(examples/modify)
377377
add_test(NAME zip-utils-modify COMMAND zip-utils-modify)
378378

379-
if (ZIP_UTILS_OS_WIN)
380-
add_subdirectory(examples/progress)
379+
if (ZIP_UTILS_OS_WIN)
380+
add_subdirectory(examples/progress)
381381
add_test(NAME zip-utils-progress COMMAND zip-utils-progress)
382-
endif (ZIP_UTILS_OS_WIN)
383382

384-
add_subdirectory(examples/simple)
385-
add_test(NAME zip-utils-simple COMMAND zip-utils-simple)
383+
add_subdirectory(examples/simple)
384+
add_test(NAME zip-utils-simple COMMAND zip-utils-simple)
386385

387-
add_subdirectory(examples/std)
388-
add_test(NAME zip-utils-std COMMAND zip-utils-std)
386+
add_subdirectory(examples/test)
387+
add_test(NAME zip-utils-test COMMAND zip-utils-test)
388+
endif (ZIP_UTILS_OS_WIN)
389389

390-
add_subdirectory(examples/test)
391-
add_test(NAME zip-utils-test COMMAND zip-utils-test)
390+
add_subdirectory(examples/std)
391+
add_test(NAME zip-utils-std COMMAND zip-utils-std)
392392
endif (ZU_ENABLE_UNIT_TESTS)

0 commit comments

Comments
 (0)