[cmake-commits] alex committed FindASPELL.cmake 1.1 1.2
FindCURL.cmake 1.2 1.3 FindCurses.cmake 1.6 1.7 FindDCMTK.cmake
1.4 1.5 FindEXPAT.cmake 1.1 1.2 FindGLUT.cmake 1.18 1.19
FindGTK.cmake 1.16 1.17 FindGnuplot.cmake 1.3 1.4
FindHSPELL.cmake 1.1 1.2 FindMPEG.cmake 1.5 1.6 FindMPEG2.cmake
1.6 1.7 FindMotif.cmake 1.3 1.4 FindPerl.cmake 1.9 1.10
FindPhysFS.cmake 1.4 1.5 FindPike.cmake 1.3 1.4
FindPythonLibs.cmake 1.28 1.29 FindSDL.cmake 1.10 1.11
FindTCL.cmake 1.41 1.42 FindTclsh.cmake 1.11 1.12
FindWget.cmake 1.7 1.8 readme.txt 1.11 1.12
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jul 19 09:00:53 EDT 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv20146
Modified Files:
FindASPELL.cmake FindCURL.cmake FindCurses.cmake
FindDCMTK.cmake FindEXPAT.cmake FindGLUT.cmake FindGTK.cmake
FindGnuplot.cmake FindHSPELL.cmake FindMPEG.cmake
FindMPEG2.cmake FindMotif.cmake FindPerl.cmake
FindPhysFS.cmake FindPike.cmake FindPythonLibs.cmake
FindSDL.cmake FindTCL.cmake FindTclsh.cmake FindWget.cmake
readme.txt
Log Message:
ENH: use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS() macro in most of the
not-too-complicated modules
-remove unnecessary default search paths used in the FIND_XXX() calls
Alex
Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- FindPythonLibs.cmake 18 Jul 2007 17:26:02 -0000 1.28
+++ FindPythonLibs.cmake 19 Jul 2007 13:00:51 -0000 1.29
@@ -10,110 +10,53 @@
#
INCLUDE(CMakeFindFrameworks)
-
-IF(WIN32)
- FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
- NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
- PATHS
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs/Debug
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
- )
-ENDIF(WIN32)
-
-FIND_LIBRARY(PYTHON_LIBRARY
- NAMES python25 python2.5
- python24 python2.4
- python23 python2.3
- python22 python2.2
- python21 python2.1
- python20 python2.0
- python16 python1.6
- python15 python1.5
-
- PATHS
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
-
- PATH_SUFFIXES
- python2.5/config
- python2.4/config
- python2.3/config
- python2.2/config
- python2.1/config
- python2.0/config
- python1.6/config
- python1.5/config
-
- # Avoid finding the .dll in the PATH. We want the .lib.
- NO_SYSTEM_ENVIRONMENT_PATH
-)
-
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
-SET(PYTHON_FRAMEWORK_INCLUDES)
-IF(Python_FRAMEWORKS)
- IF(NOT PYTHON_INCLUDE_PATH)
- FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
- FOREACH(dir ${Python_FRAMEWORKS})
- SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
- ${dir}/Versions/${version}/include/python${version})
- ENDFOREACH(dir)
- ENDFOREACH(version)
- ENDIF(NOT PYTHON_INCLUDE_PATH)
-ENDIF(Python_FRAMEWORKS)
-FIND_PATH(PYTHON_INCLUDE_PATH
- NAMES Python.h
+FOREACH(_CURRENT_VERSION 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
+ FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
+ PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs )
+ ENDIF(WIN32)
- PATHS
- ${PYTHON_FRAMEWORK_INCLUDES}
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+ PATH_SUFFIXES
+ python${_CURRENT_VERSION}/config
+ # Avoid finding the .dll in the PATH. We want the .lib.
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
- PATH_SUFFIXES
- python2.5
- python2.4
- python2.3
- python2.2
- python2.1
- python2.0
- python1.6
- python1.5
-)
+ SET(PYTHON_FRAMEWORK_INCLUDES)
+ IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_PATH)
+ FOREACH(dir ${Python_FRAMEWORKS})
+ SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
+ ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
+ ENDFOREACH(dir)
+ ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_PATH)
-IF (WIN32)
- MARK_AS_ADVANCED(
- PYTHON_DEBUG_LIBRARY
- PYTHON_LIBRARY
- PYTHON_INCLUDE_PATH
+ FIND_PATH(PYTHON_INCLUDE_PATH
+ NAMES Python.h
+ PATHS
+ ${PYTHON_FRAMEWORK_INCLUDES}
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+ PATH_SUFFIXES
+ python${_CURRENT_VERSION}
)
-ENDIF(WIN32)
+
+ENDFOREACH(_CURRENT_VERSION)
+
+MARK_AS_ADVANCED(
+ PYTHON_DEBUG_LIBRARY
+ PYTHON_LIBRARY
+ PYTHON_INCLUDE_PATH
+)
# Python Should be built and installed as a Framework on OSX
IF(Python_FRAMEWORKS)
@@ -141,3 +84,44 @@
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs PYTHON_LIBRARIES PYTHON_INCLUDE_PATH)
+
+MACRO(PYTHON_ADD_MODULE _NAME )
+ OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
+
+ IF(PYTHON_ENABLE_MODULE_${_NAME})
+ OPTION(PYTHON_MODULE_${_NAME}_SHARED "Add module ${_NAME} shared" FALSE)
+ IF(PYTHON_MODULE_${_NAME}_SHARED)
+ SET(PY_MODULE_TYPE MODULE)
+ ELSE(PYTHON_MODULE_${_NAME}_SHARED)
+ SET(PY_MODULE_TYPE STATIC)
+ ENDIF(PYTHON_MODULE_${_NAME}_SHARED)
+
+ SET(PY_MODULES_LIST ${PY_MODULES_LIST} ${_NAME})
+ ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN})
+ TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
+ ENDIF(PYTHON_ENABLE_MODULE_${_NAME})
+ENDMACRO(PYTHON_ADD_MODULE)
+
+MACRO(PYTHON_WRITE_MODULES_HEADER _filename)
+ GET_FILENAME_COMPONENT(_name "${_filename}" NAME)
+ STRING(REPLACE "." "_" _name "${_name}")
+ STRING(TOUPPER ${_name} _name)
+ FILE(WRITE ${_filename} "/*Created by cmake, do not edit, changes will be lost*/\n")
+ FILE(APPEND ${_filename} "#ifndef ${_name}\n")
+ FILE(APPEND ${_filename} "#define ${_name}\n\n")
+ FILE(APPEND ${_filename} "#include <Python.h>\n\n")
+
+ FOREACH(_currentModule ${PY_MODULES_LIST})
+ FILE(APPEND ${_filename} "extern void init${_currentModule}(void);\n\n")
+ ENDFOREACH(_currentModule ${PY_MODULES_LIST})
+
+ FOREACH(_currentModule ${PY_MODULES_LIST})
+ FILE(APPEND ${_filename} "int CMakeLoadPythonModule_${_currentModule}(void) \n{\n return PyImport_AppendInittab(\"${_currentModule}\", init${_currentModule});\n}\n\n")
+ ENDFOREACH(_currentModule ${PY_MODULES_LIST})
+
+ FILE(APPEND ${_filename} "#ifndef EXCLUDE_LOAD_ALL_FUNCTION\nvoid CMakeLoadAllPythonModules(void)\n{\n")
+ FOREACH(_currentModule ${PY_MODULES_LIST})
+ FILE(APPEND ${_filename} " CMakeLoadPythonModule_${_currentModule}();\n")
+ ENDFOREACH(_currentModule ${PY_MODULES_LIST})
+ FILE(APPEND ${_filename} "}\n#endif\n\n#endif\n")
+ENDMACRO(PYTHON_WRITE_MODULES_HEADER)
Index: FindASPELL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindASPELL.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindASPELL.cmake 19 Sep 2006 20:11:53 -0000 1.1
+++ FindASPELL.cmake 19 Jul 2007 13:00:51 -0000 1.2
@@ -21,20 +21,10 @@
FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15)
-IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
- SET(ASPELL_FOUND TRUE)
-ELSE (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
- SET(ASPELL_FOUND FALSE)
-ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
+# handle the QUIETLY and REQUIRED arguments and set ASPELL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL ASPELL_LIBRARIES ASPELL_INCLUDE_DIR)
-IF (ASPELL_FOUND)
- IF (NOT ASPELL_FIND_QUIETLY)
- MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}")
- ENDIF (NOT ASPELL_FIND_QUIETLY)
-ELSE (ASPELL_FOUND)
- IF (ASPELL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could NOT find ASPELL")
- ENDIF (ASPELL_FIND_REQUIRED)
-ENDIF (ASPELL_FOUND)
MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)
Index: FindCURL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCURL.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindCURL.cmake 12 Jul 2007 15:05:57 -0000 1.2
+++ FindCURL.cmake 19 Jul 2007 13:00:51 -0000 1.3
@@ -13,30 +13,15 @@
FIND_LIBRARY(CURL_LIBRARY NAMES curl)
MARK_AS_ADVANCED(CURL_LIBRARY)
-# Copy the results to the output variables.
-IF(CURL_INCLUDE_DIR AND CURL_LIBRARY)
- SET(CURL_FOUND 1)
+# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL CURL_LIBRARY CURL_INCLUDE_DIR)
+
+IF(CURL_FOUND)
SET(CURL_LIBRARIES ${CURL_LIBRARY})
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
-ELSE(CURL_INCLUDE_DIR AND CURL_LIBRARY)
- SET(CURL_FOUND 0)
+ELSE(CURL_FOUND)
SET(CURL_LIBRARIES)
SET(CURL_INCLUDE_DIRS)
-ENDIF(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-
-# Report the results.
-IF(CURL_FOUND)
- IF(NOT CURL_FIND_QUIETLY)
- MESSAGE(STATUS "CURL found: ${CURL_LIBRARIES}")
- ENDIF(NOT CURL_FIND_QUIETLY)
-ELSE(CURL_FOUND)
- SET(CURL_DIR_MESSAGE
- "CURL was not found. Make sure CURL_LIBRARY and CURL_INCLUDE_DIR are set.")
- IF(CURL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "${CURL_DIR_MESSAGE}")
- ELSE(CURL_FIND_REQUIRED)
- IF(NOT CURL_FIND_QUIETLY)
- MESSAGE(STATUS "${CURL_DIR_MESSAGE}")
- ENDIF(NOT CURL_FIND_QUIETLY)
- ENDIF(CURL_FIND_REQUIRED)
ENDIF(CURL_FOUND)
Index: FindPerl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerl.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FindPerl.cmake 24 Oct 2006 21:56:59 -0000 1.9
+++ FindPerl.cmake 19 Jul 2007 13:00:51 -0000 1.10
@@ -14,20 +14,13 @@
${CYGWIN_INSTALL_PATH}/bin
)
-MARK_AS_ADVANCED(
- PERL_EXECUTABLE
- )
-IF (NOT PERL_EXECUTABLE)
- SET(PERL_FOUND "NO")
-ELSE (NOT PERL_EXECUTABLE)
- SET(PERL_FOUND "YES")
-
- # Deprecated settings for compatibility with CMake1.4
- SET (PERL ${PERL_EXECUTABLE})
-ENDIF (NOT PERL_EXECUTABLE)
+# Deprecated settings for compatibility with CMake1.4
+SET (PERL ${PERL_EXECUTABLE})
+# handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl PERL_EXECUTABLE)
-IF (NOT PERL_FOUND AND Perl_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find Perl")
-ENDIF (NOT PERL_FOUND AND Perl_FIND_REQUIRED)
+MARK_AS_ADVANCED( PERL_EXECUTABLE )
Index: FindMPEG2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPEG2.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindMPEG2.cmake 15 Dec 2005 19:17:42 -0000 1.6
+++ FindMPEG2.cmake 19 Jul 2007 13:00:51 -0000 1.7
@@ -8,36 +8,32 @@
# MPEG2_vo_LIBRARY, where to find the vo library.
FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h
- /usr/local/include
- /usr/include
/usr/local/livid
)
FIND_LIBRARY(MPEG2_mpeg2_LIBRARY mpeg2
- /usr/local/lib
- /usr/lib
/usr/local/livid/mpeg2dec/libmpeg2/.libs
)
FIND_LIBRARY( MPEG2_vo_LIBRARY vo
- /usr/local/lib
- /usr/lib
/usr/local/livid/mpeg2dec/libvo/.libs
)
-SET( MPEG2_FOUND "NO" )
-IF(MPEG2_INCLUDE_DIR)
- IF(MPEG2_mpeg2_LIBRARY)
- SET( MPEG2_FOUND "YES" )
- SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
- ${MPEG2_vo_LIBRARY})
- #some native mpeg2 installations will depend
- #on libSDL, if found, add it in.
- INCLUDE( ${MODULE_PATH}/NewCMake/FindSDL.cmake )
- IF(SDL_FOUND)
- SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})
- ENDIF(SDL_FOUND)
+# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
+
+IF(MPEG2_FOUND)
+ SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
+ ${MPEG2_vo_LIBRARY})
+
+ #some native mpeg2 installations will depend
+ #on libSDL, if found, add it in.
+ INCLUDE( FindSDL.cmake )
+ IF(SDL_FOUND)
+ SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})
+ ENDIF(SDL_FOUND)
+ENDIF(MPEG2_FOUND)
- ENDIF(MPEG2_mpeg2_LIBRARY)
-ENDIF(MPEG2_INCLUDE_DIR)
Index: FindGLUT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGLUT.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- FindGLUT.cmake 3 Oct 2006 20:18:32 -0000 1.18
+++ FindGLUT.cmake 19 Jul 2007 13:00:51 -0000 1.19
@@ -11,16 +11,10 @@
IF(CYGWIN)
- FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
- /usr/include
- )
+ FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h )
FIND_LIBRARY( GLUT_glut_LIBRARY glut32
${OPENGL_LIBRARY_DIR}
- /usr/lib
- /usr/lib/w32api
- /usr/local/lib
- /usr/X11R6/lib
)
@@ -50,36 +44,23 @@
ELSE (APPLE)
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
- /usr/include
/usr/include/GL
- /usr/local/include
/usr/openwin/share/include
/usr/openwin/include
- /usr/X11R6/include
- /usr/include/X11
/opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglut
)
FIND_LIBRARY( GLUT_glut_LIBRARY glut
- /usr/lib
- /usr/local/lib
/usr/openwin/lib
- /usr/X11R6/lib
)
FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
- /usr/lib
- /usr/local/lib
/usr/openwin/lib
- /usr/X11R6/lib
)
FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
- /usr/lib
- /usr/local/lib
/usr/openwin/lib
- /usr/X11R6/lib
)
ENDIF (APPLE)
Index: FindGnuplot.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGnuplot.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindGnuplot.cmake 14 Dec 2005 18:51:08 -0000 1.3
+++ FindGnuplot.cmake 19 Jul 2007 13:00:51 -0000 1.4
@@ -1,20 +1,28 @@
# - this module looks for gnuplot
#
+# Once done this will define
+#
+# GNUPLOT_FOUND - system has Gnuplot
+# GNUPLOT_EXECUTABLE - the Gnuplot executable
INCLUDE(FindCygwin)
-FIND_PROGRAM(GNUPLOT
+FIND_PROGRAM(GNUPLOT_EXECUTABLE
NAMES
gnuplot
pgnuplot
wgnupl32
- PATH
+ PATHS
${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
- /usr/local/bin
- /sbin
-)
-MARK_AS_ADVANCED(
- GNUPLOT
)
+
+# for compatibility
+SET(GNUPLOT ${GNUPLOT_EXECUTABLE})
+
+# handle the QUIETLY and REQUIRED arguments and set GNUPLOT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot GNUPLOT_EXECUTABLE)
+
+MARK_AS_ADVANCED( GNUPLOT_EXECUTABLE )
+
Index: FindEXPAT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindEXPAT.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindEXPAT.cmake 19 Oct 2006 16:57:28 -0000 1.1
+++ FindEXPAT.cmake 19 Jul 2007 13:00:51 -0000 1.2
@@ -7,32 +7,22 @@
# Look for the header file.
FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h)
-MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR)
# Look for the library.
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat)
-MARK_AS_ADVANCED(EXPAT_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT EXPAT_LIBRARY EXPAT_INCLUDE_PATH)
# Copy the results to the output variables.
-IF(EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
- SET(EXPAT_FOUND 1)
+IF(EXPAT_FOUND)
SET(EXPAT_LIBRARIES ${EXPAT_LIBRARY})
SET(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})
-ELSE(EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
- SET(EXPAT_FOUND 0)
+ELSE(EXPAT_FOUND)
SET(EXPAT_LIBRARIES)
SET(EXPAT_INCLUDE_DIRS)
-ENDIF(EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
+ENDIF(EXPAT_FOUND)
-# Report the results.
-IF(NOT EXPAT_FOUND)
- SET(EXPAT_DIR_MESSAGE
- "EXPAT was not found. Make sure EXPAT_LIBRARY and EXPAT_INCLUDE_DIR are set.")
- IF(NOT EXPAT_FIND_QUIETLY)
- MESSAGE(STATUS "${EXPAT_DIR_MESSAGE}")
- ELSE(NOT EXPAT_FIND_QUIETLY)
- IF(EXPAT_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "${EXPAT_DIR_MESSAGE}")
- ENDIF(EXPAT_FIND_REQUIRED)
- ENDIF(NOT EXPAT_FIND_QUIETLY)
-ENDIF(NOT EXPAT_FOUND)
+MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
Index: FindMotif.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMotif.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindMotif.cmake 15 Dec 2005 19:17:42 -0000 1.3
+++ FindMotif.cmake 19 Jul 2007 13:00:51 -0000 1.4
@@ -5,28 +5,26 @@
# MOTIF_LIBRARIES - Link these to use Motif
SET(MOTIF_FOUND 0)
+
IF(UNIX)
FIND_PATH(MOTIF_INCLUDE_DIR
Xm/Xm.h
- /usr/X11R6/include
- /usr/local/include
/usr/openwin/include
- /usr/include
)
FIND_LIBRARY(MOTIF_LIBRARIES
Xm
- /usr/X11R6/lib
- /usr/local/lib
/usr/openwin/lib
- /usr/lib
)
- IF(MOTIF_LIBRARIES AND MOTIF_INCLUDE_DIR)
- SET(MOTIF_FOUND 1)
- ENDIF(MOTIF_LIBRARIES AND MOTIF_INCLUDE_DIR)
ENDIF(UNIX)
+# handle the QUIETLY and REQUIRED arguments and set MOTIF_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Motif MOTIF_LIBRARIES MOTIF_INCLUDE_DIR)
+
+
MARK_AS_ADVANCED(
MOTIF_INCLUDE_DIR
MOTIF_LIBRARIES
Index: FindPhysFS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPhysFS.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FindPhysFS.cmake 15 Dec 2005 19:17:42 -0000 1.4
+++ FindPhysFS.cmake 19 Jul 2007 13:00:51 -0000 1.5
@@ -14,23 +14,15 @@
# On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of
# PHYSFS_LIBRARY to override this selection.
-FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
+
+FIND_PATH(PHYSFS_INCLUDE_DIR NAMES physfs.h
+ PATH_SUFFIXES physfs
+ PATHS
$ENV{PHYSFSDIR}/include
~/Library/Frameworks/PhysFS.framework/Headers
/Library/Frameworks/PhysFS.framework/Headers
- /usr/local/include/physfs
- /usr/local/include
- /usr/include/physfs
- /usr/include
- /sw/include/physfs # Fink
- /sw/include
- /opt/local/include/physfs # DarwinPorts
- /opt/local/include
- /opt/csw/include/physfs # Blastwave
- /opt/csw/include
- /opt/include/physfs
- /opt/include
)
+
# I'm not sure if I should do a special casing for Apple. It is
# unlikely that other Unix systems will find the framework path.
# But if they do ([Next|Open|GNU]Step?),
@@ -58,17 +50,11 @@
NAMES physfs PhysFS
PATHS
$ENV{PHYSFSDIR}/lib
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
)
-ENDIF(${PHYSFS_INCLUDE_DIR} MATCHES ".framework")
-SET(PHYSFS_FOUND "NO")
-IF(PHYSFS_LIBRARY)
- SET(PHYSFS_FOUND "YES")
-ENDIF(PHYSFS_LIBRARY)
+ENDIF(${PHYSFS_INCLUDE_DIR} MATCHES ".framework")
+# handle the QUIETLY and REQUIRED arguments and set PHYSFS_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
Index: FindHSPELL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHSPELL.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindHSPELL.cmake 19 Sep 2006 20:11:53 -0000 1.1
+++ FindHSPELL.cmake 19 Jul 2007 13:00:51 -0000 1.2
@@ -22,21 +22,11 @@
FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell )
-IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
- SET(HSPELL_FOUND TRUE)
-ELSE (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
- SET(HSPELL_FOUND FALSE)
-ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
+# handle the QUIETLY and REQUIRED arguments and set HSPELL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL HSPELL_LIBRARIES HSPELL_INCLUDE_DIR)
-IF (HSPELL_FOUND)
- IF (NOT HSPELL_FIND_QUIETLY)
- MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}")
- ENDIF (NOT HSPELL_FIND_QUIETLY)
-ELSE (HSPELL_FOUND)
- IF (HSPELL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could NOT find HSPELL")
- ENDIF (HSPELL_FIND_REQUIRED)
-ENDIF (HSPELL_FOUND)
MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)
Index: FindWget.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWget.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FindWget.cmake 15 Dec 2005 19:17:43 -0000 1.7
+++ FindWget.cmake 19 Jul 2007 13:00:51 -0000 1.8
@@ -11,16 +11,12 @@
${CYGWIN_INSTALL_PATH}/bin
)
-IF (WGET_EXECUTABLE)
- SET(WGET_FOUND "Yes")
-ELSE (WGET_EXECUTABLE)
- SET(WGET_FOUND "No")
-ENDIF (WGET_EXECUTABLE)
-
+# handle the QUIETLY and REQUIRED arguments and set WGET_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Wget WGET_EXECUTABLE)
-MARK_AS_ADVANCED(
- WGET_EXECUTABLE
-)
+MARK_AS_ADVANCED( WGET_EXECUTABLE )
# WGET option is deprecated.
# use WGET_EXECUTABLE instead.
Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindCurses.cmake 14 Dec 2005 18:51:08 -0000 1.6
+++ FindCurses.cmake 19 Jul 2007 13:00:51 -0000 1.7
@@ -1,35 +1,13 @@
# - Find the curses include file and library
#
-FIND_PATH(CURSES_INCLUDE_PATH
- curses.h
- /usr/local/include
- /usr/include
-)
+FIND_PATH(CURSES_INCLUDE_PATH curses.h )
-FIND_LIBRARY(CURSES_LIBRARY
- NAMES curses ncurses
- PATHS
- /usr/local/lib
- /usr/lib
- /lib
-)
+FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses )
-FIND_LIBRARY(CURSES_EXTRA_LIBRARY
- cur_colr
- PATHS
- /usr/local/lib
- /usr/lib
- /lib
-)
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
-FIND_LIBRARY(FORM_LIBRARY
- form
- PATHS
- /usr/local/lib
- /usr/lib
- /lib
-)
+FIND_LIBRARY(FORM_LIBRARY form )
# Need to provide the *_LIBRARIES
SET(CURSES_LIBRARIES ${CURSES_LIBRARY})
@@ -45,6 +23,12 @@
# Proper name is *_INCLUDE_DIR
SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
+# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses CURSES_LIBRARY CURSES_INCLUDE_PATH)
+
+
MARK_AS_ADVANCED(
CURSES_INCLUDE_PATH
CURSES_LIBRARY
Index: FindMPEG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPEG.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindMPEG.cmake 15 Dec 2005 19:17:42 -0000 1.5
+++ FindMPEG.cmake 19 Jul 2007 13:00:51 -0000 1.6
@@ -8,28 +8,22 @@
# MPEG_vo_LIBRARY, where to find the vo library.
FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
- /usr/local/include
- /usr/include
/usr/local/livid
)
FIND_LIBRARY(MPEG_mpeg2_LIBRARY mpeg2
- /usr/local/lib
- /usr/lib
/usr/local/livid/mpeg2dec/libmpeg2/.libs
)
FIND_LIBRARY( MPEG_vo_LIBRARY vo
- /usr/local/lib
- /usr/lib
/usr/local/livid/mpeg2dec/libvo/.libs
)
-SET( MPEG_FOUND "NO" )
-IF(MPEG_INCLUDE_DIR)
- IF(MPEG_mpeg2_LIBRARY)
- SET( MPEG_FOUND "YES" )
- SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
- ENDIF(MPEG_mpeg2_LIBRARY)
-ENDIF(MPEG_INCLUDE_DIR)
+# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+IF(MPEG_FOUND)
+ SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
+ENDIF(MPEG_FOUND)
Index: FindDCMTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDCMTK.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FindDCMTK.cmake 14 Dec 2005 18:51:08 -0000 1.4
+++ FindDCMTK.cmake 19 Jul 2007 13:00:51 -0000 1.5
@@ -74,13 +74,13 @@
)
-IF( DCMTK_config_INCLUDE_DIR )
-IF( DCMTK_ofstd_INCLUDE_DIR )
-IF( DCMTK_ofstd_LIBRARY )
-IF( DCMTK_dcmdata_INCLUDE_DIR )
-IF( DCMTK_dcmdata_LIBRARY )
-IF( DCMTK_dcmimgle_INCLUDE_DIR )
-IF( DCMTK_dcmimgle_LIBRARY )
+IF( DCMTK_config_INCLUDE_DIR
+ AND DCMTK_ofstd_INCLUDE_DIR
+ AND DCMTK_ofstd_LIBRARY
+ AND DCMTK_dcmdata_INCLUDE_DIR
+ AND DCMTK_dcmdata_LIBRARY
+ AND DCMTK_dcmimgle_INCLUDE_DIR
+ AND DCMTK_dcmimgle_LIBRARY )
SET( DCMTK_FOUND "YES" )
SET( DCMTK_INCLUDE_DIR
@@ -115,13 +115,13 @@
SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} netapi32 )
ENDIF( WIN32 )
-ENDIF( DCMTK_dcmimgle_LIBRARY )
-ENDIF( DCMTK_dcmimgle_INCLUDE_DIR )
-ENDIF( DCMTK_dcmdata_LIBRARY )
-ENDIF( DCMTK_dcmdata_INCLUDE_DIR )
-ENDIF( DCMTK_ofstd_LIBRARY )
-ENDIF( DCMTK_ofstd_INCLUDE_DIR )
-ENDIF( DCMTK_config_INCLUDE_DIR )
+ENDIF( DCMTK_config_INCLUDE_DIR
+ AND DCMTK_ofstd_INCLUDE_DIR
+ AND DCMTK_ofstd_LIBRARY
+ AND DCMTK_dcmdata_INCLUDE_DIR
+ AND DCMTK_dcmdata_LIBRARY
+ AND DCMTK_dcmimgle_INCLUDE_DIR
+ AND DCMTK_dcmimgle_LIBRARY )
IF( NOT DCMTK_FOUND )
SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." )
Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FindSDL.cmake 3 Oct 2006 17:48:54 -0000 1.10
+++ FindSDL.cmake 19 Jul 2007 13:00:51 -0000 1.11
@@ -29,27 +29,15 @@
# This needed to change because "proper" SDL convention
# is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
# reasons because not all systems place things in SDL/ (see FreeBSD).
-FIND_PATH(SDL_INCLUDE_DIR SDL.h
+
+FIND_PATH(SDL_INCLUDE_DIR NAMES SDL.h
+ PATH_SUFFIXES SDL SDL12 SDL11
+ PATHS
$ENV{SDLDIR}/include
~/Library/Frameworks/SDL.framework/Headers
/Library/Frameworks/SDL.framework/Headers
- /usr/local/include/SDL
- /usr/include/SDL
- /usr/local/include/SDL12
- /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
- /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
- /opt/csw/include/SDL # Blastwave
- /opt/csw/include
- /opt/include/SDL
- /opt/include
)
+
# I'm not sure if I should do a special casing for Apple. It is
# unlikely that other Unix systems will find the framework path.
# But if they do ([Next|Open|GNU]Step?),
@@ -86,13 +74,8 @@
NAMES SDL SDL-1.1
PATHS
$ENV{SDLDIR}/lib
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
)
+
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other platforms
# seem to provide SDLmain for compatibility even though they don't
@@ -101,12 +84,6 @@
NAMES SDLmain SDLmain-1.1
PATHS
$ENV{SDLDIR}/lib
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
)
ENDIF(${SDL_INCLUDE_DIR} MATCHES ".framework")
@@ -125,7 +102,6 @@
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
ENDIF(MINGW)
-SET(SDL_FOUND "NO")
IF(SDL_LIBRARY_TEMP)
# For SDLmain
IF(SDLMAIN_LIBRARY)
@@ -156,7 +132,11 @@
# Set the final string here so the GUI reflects the final state.
SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
- SET(SDL_FOUND "YES")
ENDIF(SDL_LIBRARY_TEMP)
+# handle the QUIETLY and REQUIRED arguments and set SDL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL SDL_LIBRARY_TEMP)
+
MARK_AS_ADVANCED(SDL_LIBRARY_TEMP)
Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- FindTCL.cmake 18 Jul 2007 17:56:45 -0000 1.41
+++ FindTCL.cmake 19 Jul 2007 13:00:51 -0000 1.42
@@ -35,6 +35,8 @@
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib
+ /usr/lib
+ /usr/local/lib
)
FIND_LIBRARY(TCL_LIBRARY
Index: FindPike.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPike.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindPike.cmake 15 Dec 2005 19:17:42 -0000 1.3
+++ FindPike.cmake 19 Jul 2007 13:00:51 -0000 1.4
@@ -16,9 +16,6 @@
FIND_PROGRAM(PIKE_EXECUTABLE
NAMES pike7.4
- PATHS
- /usr/bin
- /usr/local/bin
)
MARK_AS_ADVANCED(
Index: FindGTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGTK.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FindGTK.cmake 15 Dec 2005 15:41:19 -0000 1.16
+++ FindGTK.cmake 19 Jul 2007 13:00:51 -0000 1.17
@@ -7,16 +7,11 @@
# don't even bother under WIN32
IF(UNIX)
- FIND_PATH( GTK_gtk_INCLUDE_PATH gtk/gtk.h
- /usr/include
- /usr/local/include
+ FIND_PATH( GTK_gtk_INCLUDE_PATH NAMES gtk/gtk.h
+ PATH_SUFFIXES gtk-1.2 gtk12
+ PATHS
/usr/openwin/share/include
/usr/openwin/include
- /usr/X11R6/include
- /usr/include/X11
- /usr/X11R6/include/gtk12
- /usr/include/gtk-1.2
- /usr/local/include/gtk-1.2
/opt/gnome/include
)
@@ -25,9 +20,8 @@
# for both.
# - Atanas Georgiev <atanas at cs.columbia.edu>
- FIND_PATH( GTK_glibconfig_INCLUDE_PATH glibconfig.h
- /usr/include
- /usr/local/include
+ FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
+ PATHS
/usr/openwin/share/include
/usr/local/include/glib12
/usr/lib/glib/include
@@ -36,31 +30,21 @@
/opt/gnome/lib/glib/include
)
- FIND_PATH( GTK_glib_INCLUDE_PATH glib.h
- /usr/include
- /usr/local/include
+ FIND_PATH( GTK_glib_INCLUDE_PATH NAMES glib.h
+ PATH_SUFFIXES gtk-1.2 glib-1.2 glib12
+ PATHS
/usr/openwin/share/include
- /usr/include/gtk-1.2
- /usr/local/include/glib12
/usr/lib/glib/include
- /usr/include/glib-1.2
- /usr/local/include/glib-1.2
/opt/gnome/include
- /opt/gnome/include/glib-1.2
)
- FIND_PATH( GTK_gtkgl_INCLUDE_PATH gtkgl/gtkglarea.h
- /usr/include
- /usr/local/include
- /usr/openwin/share/include
- /opt/gnome/include
+ FIND_PATH( GTK_gtkgl_INCLUDE_PATH NAMES gtkgl/gtkglarea.h
+ PATHS /usr/openwin/share/include
+ /opt/gnome/include
)
FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
- /usr/lib
- /usr/local/lib
/usr/openwin/lib
- /usr/X11R6/lib
/opt/gnome/lib
)
@@ -70,63 +54,45 @@
FIND_LIBRARY( GTK_gtk_LIBRARY
NAMES gtk gtk12
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
+ PATHS /usr/openwin/lib
/opt/gnome/lib
)
FIND_LIBRARY( GTK_gdk_LIBRARY
NAMES gdk gdk12
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
+ PATHS /usr/openwin/lib
/opt/gnome/lib
)
FIND_LIBRARY( GTK_gmodule_LIBRARY
NAMES gmodule gmodule12
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
+ PATHS /usr/openwin/lib
/opt/gnome/lib
)
FIND_LIBRARY( GTK_glib_LIBRARY
NAMES glib glib12
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
+ PATHS /usr/openwin/lib
/opt/gnome/lib
)
FIND_LIBRARY( GTK_Xi_LIBRARY
NAMES Xi
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
+ PATHS /usr/openwin/lib
+ /opt/gnome/lib
)
FIND_LIBRARY( GTK_gthread_LIBRARY
NAMES gthread gthread12
- PATHS /usr/lib
- /usr/local/lib
- /usr/openwin/lib
- /usr/X11R6/lib
+ PATHS /usr/openwin/lib
/opt/gnome/lib
)
- IF(GTK_gtk_INCLUDE_PATH)
- IF(GTK_glibconfig_INCLUDE_PATH)
- IF(GTK_glib_INCLUDE_PATH)
- IF(GTK_gtk_LIBRARY)
- IF(GTK_glib_LIBRARY)
+ IF(GTK_gtk_INCLUDE_PATH
+ AND GTK_glibconfig_INCLUDE_PATH
+ AND GTK_glib_INCLUDE_PATH
+ AND GTK_gtk_LIBRARY
+ AND GTK_glib_LIBRARY)
# Assume that if gtk and glib were found, the other
# supporting libraries have also been found.
@@ -149,24 +115,22 @@
SET(GTK_LIBRARIES ${GTK_LIBRARIES} ${GTK_Xi_LIBRARY})
ENDIF(GTK_Xi_LIBRARY)
- IF(GTK_gtkgl_INCLUDE_PATH)
- IF(GTK_gtkgl_LIBRARY)
- SET( GTK_GL_FOUND "YES" )
- SET( GTK_INCLUDE_DIR ${GTK_INCLUDE_DIR}
- ${GTK_gtkgl_INCLUDE_PATH} )
- SET( GTK_LIBRARIES ${GTK_gtkgl_LIBRARY} ${GTK_LIBRARIES} )
- MARK_AS_ADVANCED(
- GTK_gtkgl_LIBRARY
- GTK_gtkgl_INCLUDE_PATH
- )
- ENDIF(GTK_gtkgl_LIBRARY)
- ENDIF(GTK_gtkgl_INCLUDE_PATH)
+ IF(GTK_gtkgl_INCLUDE_PATH AND GTK_gtkgl_LIBRARY)
+ SET( GTK_GL_FOUND "YES" )
+ SET( GTK_INCLUDE_DIR ${GTK_INCLUDE_DIR}
+ ${GTK_gtkgl_INCLUDE_PATH} )
+ SET( GTK_LIBRARIES ${GTK_gtkgl_LIBRARY} ${GTK_LIBRARIES} )
+ MARK_AS_ADVANCED(
+ GTK_gtkgl_LIBRARY
+ GTK_gtkgl_INCLUDE_PATH
+ )
+ ENDIF(GTK_gtkgl_INCLUDE_PATH AND GTK_gtkgl_LIBRARY)
- ENDIF(GTK_glib_LIBRARY)
- ENDIF(GTK_gtk_LIBRARY)
- ENDIF(GTK_glib_INCLUDE_PATH)
- ENDIF(GTK_glibconfig_INCLUDE_PATH)
- ENDIF(GTK_gtk_INCLUDE_PATH)
+ ENDIF(GTK_gtk_INCLUDE_PATH
+ AND GTK_glibconfig_INCLUDE_PATH
+ AND GTK_glib_INCLUDE_PATH
+ AND GTK_gtk_LIBRARY
+ AND GTK_glib_LIBRARY)
MARK_AS_ADVANCED(
GTK_gdk_LIBRARY
@@ -184,3 +148,5 @@
ENDIF(UNIX)
+
+
Index: readme.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/readme.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- readme.txt 1 Nov 2006 14:06:27 -0000 1.11
+++ readme.txt 19 Jul 2007 13:00:51 -0000 1.12
@@ -53,7 +53,7 @@
#
# It even needs to paragraphs to tell you about it.
# And it defines the following variables:
-# VAR_COOL - this is greate isn't it?
+# VAR_COOL - this is great isn't it?
# VAR_REALLY_COOL - cool right?
#
@@ -68,7 +68,7 @@
If the QUIET option is given to the command it will set the variable
XXX_FIND_QUIETLY to true before loading the FindXXX.cmake module. If
this variable is set the module should not complain about not being
-able to find the package and should never issue a FATAL_ERROR. If the
+able to find the package. If the
REQUIRED option is given to the command it will set the variable
XXX_FIND_REQUIRED to true before loading the FindXXX.cmake module. If
this variable is set the module should issue a FATAL_ERROR if the
@@ -80,3 +80,6 @@
If neither the QUIET nor REQUIRED options are given then the
FindXXX.cmake module should look for the package and complain without
error if the module is not found.
+
+To get this behaviour you can use the FIND_PACKAGE_HANDLE_STANDARD_ARGS()
+macro, as an example see FindJPEG.cmake.
Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FindTclsh.cmake 13 Oct 2006 15:25:07 -0000 1.11
+++ FindTclsh.cmake 19 Jul 2007 13:00:51 -0000 1.12
@@ -2,14 +2,14 @@
# This module finds if TCL is installed and determines where the
# include files and libraries are. It also determines what the name of
# the library is. This code sets the following variables:
+# TCLSH_FOUND = TRUE if tclsh has been found
# TCL_TCLSH = the path to the tclsh executable
# In cygwin, look for the cygwin version first. Don't look for it later to
# avoid finding the cygwin version on a Win32 build.
-IF(WIN32)
- IF(UNIX)
- FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
- ENDIF(UNIX)
-ENDIF(WIN32)
+
+IF(WIN32 AND UNIX)
+ FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
+ENDIF(WIN32 AND UNIX)
GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
@@ -32,4 +32,9 @@
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin
)
+# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh TCL_TCLSH)
+
MARK_AS_ADVANCED( TCL_TCLSH )
More information about the Cmake-commits
mailing list