Bug #2524: Addition of CMake build files - correction for flags setting

Additional compilation flags were passed to the command "set" as a second parameter.
This had the effect that the passed parameters were converted to a CMake list.
The variable "CMAKE_CXX_FLAGS" got an unwanted semicolon.

These flags are handled by a single string now.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Author: elfring

cli/CMakeLists.txt

@@ -40,10 +40,7 @@ set(CHECK_LIBS
 endif (WIN32 AND NOT CYGWIN)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual"
-  )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 include_directories (${CPPCHECK_SOURCE_DIR}/lib)

gui/CMakeLists.txt

@@ -106,10 +106,7 @@ set(CHECK_LIBS
 endif (WIN32 AND NOT CYGWIN)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall"
-  )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 # Generate rules for building source files from the resources

lib/CMakeLists.txt

@@ -55,10 +55,7 @@ SET(CHECKLIB_SRCS
 )
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual"
-  )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_LIBRARY(checklib STATIC ${CHECKLIB_SRCS} ${CHECKLIB_HDRS})

test/CMakeLists.txt

@@ -48,10 +48,7 @@ set(CHECK_LIBS
 endif (WIN32 AND NOT CYGWIN)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual"
-  )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 include_directories (${CPPCHECK_SOURCE_DIR}/lib)