aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2007-06-09 14:24:46 +0000
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2007-06-09 14:24:46 +0000
commitf48606a15f65b1966722d301e5730e5d19cafa78 (patch)
treefed6f63e5cd9ddbef013d3f9bf04f0f3acd2c41e
parentc383c791ece6f71742632157919805506e1e74af (diff)
downloadextra-cmake-modules-f48606a15f65b1966722d301e5730e5d19cafa78.tar.gz
extra-cmake-modules-f48606a15f65b1966722d301e5730e5d19cafa78.tar.bz2
small update for win32/msvc9
svn path=/trunk/KDE/kdelibs/; revision=673238
-rw-r--r--modules/FindKDE4Internal.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index dced461c..bfcd1f07 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -553,9 +553,11 @@ if (WIN32)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4250" )
# C4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4251" )
+ # C4396: 'identifier' : 'function' the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4396" )
if(CMAKE_COMPILER_2005)
# to avoid a lot of deprecated warnings
- add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE )
+ add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS )
# 'identifier' : no suitable definition provided for explicit template instantiation request
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4661" )
endif(CMAKE_COMPILER_2005)