[Cmake-commits] [cmake-commits] hoffman committed FindFLTK.cmake 1.36 1.37 FindKDE3.cmake 1.11 1.12 FindMatlab.cmake 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	FindFLTK.cmake FindKDE3.cmake FindMatlab.cmake 
Log Message:
ENH: fix find module stuff for test


Index: FindMatlab.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMatlab.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindMatlab.cmake	15 Dec 2005 15:41:19 -0000	1.3
--- FindMatlab.cmake	16 Jun 2008 19:19:43 -0000	1.4
***************
*** 22,26 ****
          SET(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
        ELSE(${CMAKE_GENERATOR} MATCHES "Borland")
!         MESSAGE(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
        ENDIF(${CMAKE_GENERATOR} MATCHES "Borland")
      ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
--- 22,28 ----
          SET(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
        ELSE(${CMAKE_GENERATOR} MATCHES "Borland")
!         IF(MATLAB_FIND_REQUIRED)
!           MESSAGE(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
!         ENDIF(MATLAB_FIND_REQUIRED)
        ENDIF(${CMAKE_GENERATOR} MATCHES "Borland")
      ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")

Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** FindKDE3.cmake	9 Jun 2008 20:04:05 -0000	1.11
--- FindKDE3.cmake	16 Jun 2008 19:19:43 -0000	1.12
***************
*** 64,70 ****
  # Author: Alexander Neundorf <neundorf at kde.org>
  
! IF(NOT UNIX)
     MESSAGE(FATAL_ERROR "Compiling KDE3 applications and libraries under Windows is not supported")
! ENDIF(NOT UNIX)
  
  
--- 64,70 ----
  # Author: Alexander Neundorf <neundorf at kde.org>
  
! IF(NOT UNIX AND KDE3_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Compiling KDE3 applications and libraries under Windows is not supported")
! ENDIF(NOT UNIX AND KDE3_FIND_REQUIRED)
  
  
***************
*** 73,78 ****
  
  #this line includes FindQt.cmake, which searches the Qt library and headers
! FIND_PACKAGE(Qt3 REQUIRED)
! FIND_PACKAGE(X11 REQUIRED)
  
  
--- 73,82 ----
  
  #this line includes FindQt.cmake, which searches the Qt library and headers
! IF(KDE3_FIND_REQUIRED)
!   SET(_REQ_STRING_KDE3 "REQUIRED")
! ENDIF(KDE3_FIND_REQUIRED)
!   
! FIND_PACKAGE(Qt3 ${_REQ_STRING_KDE3})
! FIND_PACKAGE(X11 ${_REQ_STRING_KDE3})
  
  

Index: FindFLTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFLTK.cmake,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** FindFLTK.cmake	15 Dec 2005 15:41:19 -0000	1.36
--- FindFLTK.cmake	16 Jun 2008 19:19:43 -0000	1.37
***************
*** 12,15 ****
--- 12,20 ----
  #  FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib
  
+ IF (FLTK_INCLUDE_DIR)
+   # Already in cache, be silent
+   SET(FLTK_FIND_QUIETLY TRUE)
+ ENDIF (FLTK_INCLUDE_DIR)
+ 
  #  Platform dependent libraries required by FLTK
  IF(WIN32)
***************
*** 25,29 ****
  IF(UNIX)
    INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
!   SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm)
  ENDIF(UNIX)
  
--- 30,35 ----
  IF(UNIX)
    INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
!   FIND_LIBRARY(FLTK_MATH_LIBRARY m)
!   SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} ${FLTK_MATH_LIBRARY})
  ENDIF(UNIX)
  
***************
*** 33,37 ****
  
  IF(CYGWIN)
!   SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
  ENDIF(CYGWIN)
  
--- 39,44 ----
  
  IF(CYGWIN)
!   FIND_LIBRARY(FLTK_MATH_LIBRARY m)
!   SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ ${FLTK_MATH_LIBRARY} -lgdi32)
  ENDIF(CYGWIN)
  
***************
*** 97,104 ****
  ENDIF(NOT FLTK_DIR)
  
- # If FLTK was found, load the configuration file to get the rest of the
- # settings.
- IF(FLTK_DIR)
- 
    # Check if FLTK was built using CMake
    IF(EXISTS ${FLTK_DIR}/FLTKConfig.cmake)
--- 104,107 ----
***************
*** 171,176 ****
  
      SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
-       /usr/local/include
-       /usr/include
        /usr/local/fltk
        /usr/X11R6/include
--- 174,177 ----
***************
*** 180,185 ****
  
      SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
-       /usr/lib
-       /usr/local/lib
        /usr/local/fltk/lib
        /usr/X11R6/lib
--- 181,184 ----
***************
*** 216,220 ****
  
    ENDIF(FLTK_BUILT_WITH_CMAKE)
- ENDIF(FLTK_DIR)
  
  
--- 215,218 ----
***************
*** 243,244 ****
--- 241,245 ----
    SET (FLTK_LIBRARY ${FLTK_LIBRARIES})
  ENDIF(FLTK_FOUND)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR)