suppress Qt4 warning on OSX

lifeng98ol · Nov 24, 2013 · 3968c12 · 3968c12
1 parent 589fb7f
commit 3968c12
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/cmake/QtChooser.cmake b/cmake/QtChooser.cmake
@@ -66,3 +66,8 @@ macro(qt_use_modules)
         target_link_libraries(${ARGV0} ${QT_LIBRARIES})
     endif()
 endmacro()
+
+macro(qt_suppress_warnings)
+set_target_properties(${ARGV0} PROPERTIES
+                        COMPILE_FLAGS "-Wno-#warnings")
+endmacro()
diff --git a/lib/aggregation/CMakeLists.txt b/lib/aggregation/CMakeLists.txt
@@ -12,6 +12,7 @@ set(aggr_SOURCES
 include(QtChooser)
 add_library(aggregation SHARED ${aggr_SOURCES} ${aggr_HEADERS})
 qt_use_modules(aggregation Core)
+qt_suppress_warnings(aggregation)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/lib/extensionsystem/CMakeLists.txt b/lib/extensionsystem/CMakeLists.txt
@@ -47,6 +47,7 @@ qt_add_resources(extsys_RC ${extsys_RESOURCES})
 message(STATUS ${extsys_RC})
 add_library(extensionsystem SHARED ${extsys_SOURCES} ${extsys_HEADERS} ${extsys_FORM_HEADERS} ${extsys_RC})
 qt_use_modules(extensionsystem)
+qt_suppress_warnings(extensionsystem)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/lib/quazip/CMakeLists.txt b/lib/quazip/CMakeLists.txt
@@ -3,27 +3,10 @@ project (QuaZip)
 file(GLOB SRCS "*.c" "*.cpp")
 file(GLOB PUBLIC_HEADERS "*.h")
 
-#find_package(ZLIB)
-#if(NOT ZLIB_FOUND)
-#    message("ZLIB not found, quazip using local: ${clucene-ext_SOURCE_DIR}/zlib")
-#    set(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib)
-#    set(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR})
-#endif(NOT ZLIB_FOUND)
-
-#INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} )
-
-#find_package(ZLIB)
-#if(NOT ZLIB_FOUND)
-#	SET(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt")
-#	SET(ZLIB_LIBRARIES "")
-#	IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-#		MESSAGE("Please specify a valid zlib include dir")
-#	ENDIF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-#ENDIF(NOT ZLIB_FOUND)
-
 include(QtChooser)
 add_library(quazip STATIC ${SRCS} ${PUBLIC_HEADERS})
 qt_use_modules(quazip)
+qt_suppress_warnings(quazip)
 
 # set all include directories for in and out of source builds
 include_directories(

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -310,7 +310,8 @@ if(UNIX)
     endif()
 endif()
 
-qt_use_modules(${PROJECT_NAME})
+qt_use_modules(wiznote)
+qt_suppress_warnings(wiznote)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt
@@ -21,6 +21,7 @@ include(QtChooser)
 qt_add_ui(coreplugin_FORM_HEADERS ${coreplugin_FORMS})
 add_library(coreplugin SHARED ${coreplugin_SOURCES} ${coreplugin_HEADERS} ${coreplugin_FORM_HEADERS} ${coreplugin_SPEC})
 qt_use_modules(coreplugin)
+qt_suppress_warnings(coreplugin)
 
 add_definitions(-DCORE_LIBRARY)
 

diff --git a/src/plugins/helloworld/CMakeLists.txt b/src/plugins/helloworld/CMakeLists.txt
@@ -17,6 +17,7 @@ set(helloworld_SPEC
 include(QtChooser)
 add_library(helloworld SHARED ${helloworld_SOURCES} ${helloworld_HEADERS} ${helloworld_SPEC})
 qt_use_modules(helloworld)
+qt_suppress_warnings(helloworld)
 
 # set all include directories for in and out of source builds
 include_directories(