[Cmake-commits] [cmake-commits] hoffman committed FindKDE3.cmake 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv1653

Modified Files:
	FindKDE3.cmake 
Log Message:
ENH: fix for findall


Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** FindKDE3.cmake	18 Jun 2008 12:42:51 -0000	1.14
--- FindKDE3.cmake	18 Jun 2008 13:22:04 -0000	1.15
***************
*** 83,105 ****
  #add some KDE specific stuff
  SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
  
  #only on linux, but NOT e.g. on FreeBSD:
! IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND CMAKE_COMPILER_IS_GNUCXX)
     SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
! ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND CMAKE_COMPILER_IS_GNUCXX)
  
  # works on FreeBSD, NOT tested on NetBSD and OpenBSD
! IF (CMAKE_SYSTEM_NAME MATCHES BSD AND CMAKE_COMPILER_IS_GNUCXX)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
! ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD AND CMAKE_COMPILER_IS_GNUCXX)
  
  # if no special buildtype is selected, add -O2 as default optimization
! IF (NOT CMAKE_BUILD_TYPE AND CMAKE_COMPILER_IS_GNUCXX)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
! ENDIF (NOT CMAKE_BUILD_TYPE AND CMAKE_COMPILER_IS_GNUCXX)
  
  
--- 83,115 ----
  #add some KDE specific stuff
  SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
+ set(_KDE3_USE_FLAGS FALSE)
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(_KDE3_USE_FLAGS TRUE) # use flags for gnu compiler
+   execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+                   OUTPUT_VARIABLE out)
+   # gnu 2.96 does not work with flags
+   if(out MATCHES 2.96)
+     set(_KDE3_NO_FLAGS FALSE)
+   endif(out MATCHES 2.96)
+ endif(CMAKE_COMPILER_IS_GNUCXX)
  
  #only on linux, but NOT e.g. on FreeBSD:
! IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_NO_FLAGS)
     SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
! ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_NO_FLAGS)
  
  # works on FreeBSD, NOT tested on NetBSD and OpenBSD
! IF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_NO_FLAGS)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
! ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_NO_FLAGS)
  
  # if no special buildtype is selected, add -O2 as default optimization
! IF (NOT CMAKE_BUILD_TYPE AND _KDE3_NO_FLAGS)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
! ENDIF (NOT CMAKE_BUILD_TYPE AND _KDE3_NO_FLAGS)