File tree Expand file tree Collapse file tree 2 files changed +23
-1
lines changed
Expand file tree Collapse file tree 2 files changed +23
-1
lines changed Original file line number Diff line number Diff line change @@ -145,6 +145,18 @@ IF (MSGPACK_BUILD_TESTS)
145145 ADD_SUBDIRECTORY (test )
146146ENDIF ()
147147
148+ IF (CMAKE_COMPILER_IS_GNUCC)
149+ SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS -Wall )
150+ SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS -Wall )
151+ ENDIF ()
152+ IF ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "MSVC" )
153+ IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]" )
154+ STRING (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " )
155+ ELSE ()
156+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4" )
157+ ENDIF ()
158+ ENDIF ()
159+
148160INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
149161INSTALL (DIRECTORY src/msgpack DESTINATION include )
150162INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include )
Original file line number Diff line number Diff line change @@ -42,4 +42,14 @@ FOREACH (source_file ${check_PROGRAMS})
4242 ${CMAKE_THREAD_LIBS_INIT}
4343 )
4444 ADD_TEST (${source_file_we} ${source_file_we} )
45- ENDFOREACH ()
45+ IF (CMAKE_COMPILER_IS_GNUCC)
46+ SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS -Wall )
47+ ENDIF ()
48+ IF ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "MSVC" )
49+ IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]" )
50+ STRING (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " )
51+ ELSE ()
52+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4" )
53+ ENDIF ()
54+ ENDIF ()
55+ ENDFOREACH ()
You can’t perform that action at this time.
0 commit comments