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

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 18 12:23:52 EDT 2008


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

Modified Files:
	FindKDE3.cmake 
Log Message:
ENH: use correct variable


Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** FindKDE3.cmake	18 Jun 2008 13:22:04 -0000	1.15
--- FindKDE3.cmake	18 Jun 2008 16:23:50 -0000	1.16
***************
*** 95,115 ****
  
  #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)
  
  
--- 95,115 ----
  
  #only on linux, but NOT e.g. on FreeBSD:
! IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_USE_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_USE_FLAGS)
  
  # works on FreeBSD, NOT tested on NetBSD and OpenBSD
! IF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_USE_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_USE_FLAGS)
  
  # if no special buildtype is selected, add -O2 as default optimization
! IF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
     SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
     SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
! ENDIF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
  
  



More information about the Cmake-commits mailing list