From ad4f98f3cf20c3befa18979521736dc49b458a6c Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Thu, 26 Aug 2004 22:52:53 -0400 Subject: [PATCH] ENH: Cleanup. Use relative path to modules --- Modules/CMakeBackwardCompatibilityC.cmake | 14 +++++++------- Modules/CMakeBackwardCompatibilityCXX.cmake | 10 +++++----- Modules/Documentation.cmake | 18 +++++++++--------- Modules/FindFLTK.cmake | 2 +- Modules/FindGLU.cmake | 2 +- Modules/FindGnuplot.cmake | 2 +- Modules/FindOpenGL.cmake | 2 +- Modules/FindPNG.cmake | 4 ++-- Modules/FindPerl.cmake | 10 +++++----- Modules/FindPythonLibs.cmake | 2 +- Modules/FindQt.cmake | 4 ++-- Modules/FindSelfPackers.cmake | 2 +- Modules/FindTCL.cmake | 6 +++--- Modules/FindThreads.cmake | 4 ++-- Modules/FindUnixCommands.cmake | 2 +- Modules/FindVTK.cmake | 2 +- Modules/FindWget.cmake | 2 +- Modules/FindX11.cmake | 4 ++-- Modules/FindwxWidgets.cmake | 2 +- Modules/FindwxWindows.cmake | 2 +- Modules/Platform/CYGWIN-g77.cmake | 2 +- Modules/TestForANSIStreamHeaders.cmake | 2 +- Modules/UseVTK40.cmake | 2 +- Modules/Use_wxWindows.cmake | 4 ++-- Modules/UsewxWidgets.cmake | 2 +- 25 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Modules/CMakeBackwardCompatibilityC.cmake b/Modules/CMakeBackwardCompatibilityC.cmake index 80656e20a..c9dbce1c9 100644 --- a/Modules/CMakeBackwardCompatibilityC.cmake +++ b/Modules/CMakeBackwardCompatibilityC.cmake @@ -1,15 +1,15 @@ # Nothing here yet IF(CMAKE_GENERATOR MATCHES "Visual Studio 7") - INCLUDE(${CMAKE_ROOT}/Modules/CMakeVS7BackwardCompatibility.cmake) + INCLUDE(CMakeVS7BackwardCompatibility) SET(CMAKE_SKIP_COMPATIBILITY_TESTS 1) ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7") IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") - INCLUDE(${CMAKE_ROOT}/Modules/CMakeVS6BackwardCompatibility.cmake) + INCLUDE(CMakeVS6BackwardCompatibility) SET(CMAKE_SKIP_COMPATIBILITY_TESTS 1) ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) - INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake) + INCLUDE (CheckTypeSize) CHECK_TYPE_SIZE(int CMAKE_SIZEOF_INT) CHECK_TYPE_SIZE(long CMAKE_SIZEOF_LONG) CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P) @@ -18,15 +18,15 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) CHECK_TYPE_SIZE(float CMAKE_SIZEOF_FLOAT) CHECK_TYPE_SIZE(double CMAKE_SIZEOF_DOUBLE) - INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) + INCLUDE (CheckIncludeFile) CHECK_INCLUDE_FILE("limits.h" CMAKE_HAVE_LIMITS_H) CHECK_INCLUDE_FILE("unistd.h" CMAKE_HAVE_UNISTD_H) CHECK_INCLUDE_FILE("sys/prctl.h" CMAKE_HAVE_SYS_PRCTL_H) CHECK_INCLUDE_FILE("pthread.h" CMAKE_HAVE_PTHREAD_H) - INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) + INCLUDE (TestBigEndian) TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) - INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake) + INCLUDE (FindX11) IF("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") SET (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.") @@ -38,7 +38,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) "Libraries and options used in X11 programs.") SET (CMAKE_HAS_X "${X11_FOUND}" CACHE INTERNAL "Is X11 around.") - INCLUDE (${CMAKE_ROOT}/Modules/FindThreads.cmake) + INCLUDE (FindThreads) SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING "Thread library used.") diff --git a/Modules/CMakeBackwardCompatibilityCXX.cmake b/Modules/CMakeBackwardCompatibilityCXX.cmake index 7c4554e2c..79e6f0342 100644 --- a/Modules/CMakeBackwardCompatibilityCXX.cmake +++ b/Modules/CMakeBackwardCompatibilityCXX.cmake @@ -2,7 +2,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) # check for some ANSI flags in the CXX compiler if it is not gnu IF(NOT CMAKE_COMPILER_IS_GNUCXX) - INCLUDE(${CMAKE_ROOT}/Modules/TestCXXAcceptsFlag.cmake) + INCLUDE(TestCXXAcceptsFlag) SET(CMAKE_TRY_ANSI_CXX_FLAGS "") IF(CMAKE_SYSTEM MATCHES "IRIX.*") SET(CMAKE_TRY_ANSI_CXX_FLAGS "-LANG:std") @@ -24,10 +24,10 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_FLAGS_SAVE ${CMAKE_CXX_FLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") - INCLUDE(${CMAKE_ROOT}/Modules/TestForANSIStreamHeaders.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/TestForANSIForScope.cmake) + INCLUDE(TestForANSIStreamHeaders) + INCLUDE(CheckIncludeFileCXX) + INCLUDE(TestForSTDNamespace) + INCLUDE(TestForANSIForScope) CHECK_INCLUDE_FILE_CXX("sstream" CMAKE_HAS_ANSI_STRING_STREAM) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVE}") IF(NOT CMAKE_HAS_ANSI_STRING_STREAM) diff --git a/Modules/Documentation.cmake b/Modules/Documentation.cmake index efc049152..21d52d864 100644 --- a/Modules/Documentation.cmake +++ b/Modules/Documentation.cmake @@ -14,23 +14,23 @@ IF (BUILD_DOCUMENTATION) # # Check for the tools # - INCLUDE(${CMAKE_ROOT}/Modules/FindUnixCommands.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindDoxygen.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindGnuplot.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindHTMLHelp.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindPerl.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindWget.cmake) + INCLUDE(FindUnixCommands) + INCLUDE(FindDoxygen) + INCLUDE(FindGnuplot) + INCLUDE(FindHTMLHelp) + INCLUDE(FindPerl) + INCLUDE(FindWget) OPTION(DOCUMENTATION_HTML_HELP - "Build the HTML Help file (CHM)." OFF) + "Build the HTML Help file (CHM)." OFF) OPTION(DOCUMENTATION_HTML_TARZ - "Build a compressed tar archive of the HTML doc." OFF) + "Build a compressed tar archive of the HTML doc." OFF) MARK_AS_ADVANCED( DOCUMENTATION_HTML_HELP DOCUMENTATION_HTML_TARZ - ) + ) # # The documentation process is controled by a batch file. diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index e59e17eb3..8c83fe72d 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -57,7 +57,7 @@ IF(WIN32) ENDIF(WIN32) IF(UNIX) - INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake) + INCLUDE(FindX11) SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm) ENDIF(UNIX) diff --git a/Modules/FindGLU.cmake b/Modules/FindGLU.cmake index ffb3ba358..b61828f83 100644 --- a/Modules/FindGLU.cmake +++ b/Modules/FindGLU.cmake @@ -4,7 +4,7 @@ # # -INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake) +INCLUDE(FindOpenGL) IF (OPENGL_GLU_FOUND) SET (GLU_LIBRARY ${OPENGL_LIBRARIES}) diff --git a/Modules/FindGnuplot.cmake b/Modules/FindGnuplot.cmake index 943c8a418..5a9bc28eb 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -2,7 +2,7 @@ # this module looks for gnuplot # -INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) +INCLUDE(FindCygwin) FIND_PROGRAM(GNUPLOT NAMES diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index edeca484b..5a278d86e 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -95,7 +95,7 @@ ELSE (WIN32) # It's not true on OSX. IF (OPENGL_gl_LIBRARY) - INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake ) + INCLUDE(FindX11) IF (X11_FOUND) IF (NOT APPLE) SET (OPENGL_LIBRARIES ${X11_LIBRARIES}) diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index e9beaf7ff..3ddf05e29 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -14,7 +14,7 @@ # None of the above will be defined unles zlib can be found. # PNG depends on Zlib -INCLUDE( ${CMAKE_ROOT}/Modules/FindZLIB.cmake ) +INCLUDE(FindZLIB) IF(ZLIB_FOUND) FIND_PATH(PNG_PNG_INCLUDE_DIR png.h @@ -45,4 +45,4 @@ IF(ZLIB_FOUND) ENDIF (PNG_PNG_INCLUDE_DIR) ENDIF (PNG_LIBRARY) -ENDIF(ZLIB_FOUND) \ No newline at end of file +ENDIF(ZLIB_FOUND) diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index d546bdedf..06fe6a305 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -2,9 +2,9 @@ # this module looks for Perl # # PERL_EXECUTABLE - the full path to the Perl interpreter -# PERL_FOUND - If false, don't attempt to use perl. +# PERL_FOUND - If false, don't attempt to use perl. -INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) +INCLUDE(FindCygwin) FIND_PROGRAM(PERL_EXECUTABLE perl @@ -12,18 +12,18 @@ FIND_PROGRAM(PERL_EXECUTABLE [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\804]/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\628]/bin ${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 + # Deprecated settings for compatibility with CMake1.4 SET (PERL ${PERL_EXECUTABLE}) ENDIF (NOT PERL_EXECUTABLE) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 79bbe572f..b1236f3de 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -8,7 +8,7 @@ # PYTHON_DEBUG_LIBRARIES = the full path to the debug library found # -INCLUDE(${CMAKE_ROOT}/Modules/CMakeFindFrameworks.cmake) +INCLUDE(CMakeFindFrameworks) IF(WIN32) FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 832e56292..518c71f68 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -205,7 +205,7 @@ IF(QT_FOUND) SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} ) # for unix add X11 stuff IF(UNIX) - INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake ) + INCLUDE(FindX11) IF (X11_FOUND) SET (QT_LIBRARIES ${QT_LIBRARIES} ${X11_LIBRARIES}) ENDIF (X11_FOUND) @@ -214,7 +214,7 @@ IF(QT_FOUND) ENDIF (CMAKE_DL_LIBS) ENDIF(UNIX) IF(QT_QT_LIBRARY MATCHES "qt-mt") - INCLUDE( ${CMAKE_ROOT}/Modules/FindThreads.cmake ) + INCLUDE(FindThreads) SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) ENDIF(QT_QT_LIBRARY MATCHES "qt-mt") ENDIF(QT_FOUND) diff --git a/Modules/FindSelfPackers.cmake b/Modules/FindSelfPackers.cmake index 979ebac22..e0e2cf3b3 100644 --- a/Modules/FindSelfPackers.cmake +++ b/Modules/FindSelfPackers.cmake @@ -6,7 +6,7 @@ # Examples: # UPX: http://wildsau.idv.uni-linz.ac.at/mfx/upx.html -INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) +INCLUDE(FindCygwin) FIND_PROGRAM(SELF_PACKER_FOR_EXECUTABLE upx diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 811c52897..365ab112f 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -18,9 +18,9 @@ # TK_WISH = full path to the wish binary (wish wish80 etc) # -INCLUDE(${CMAKE_ROOT}/Modules/CMakeFindFrameworks.cmake) -INCLUDE(${CMAKE_ROOT}/Modules/FindTclsh.cmake) -INCLUDE(${CMAKE_ROOT}/Modules/FindWish.cmake) +INCLUDE(CMakeFindFrameworks) +INCLUDE(FindTclsh) +INCLUDE(FindWish) GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH) diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index c183f42ee..e0bc48088 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -6,8 +6,8 @@ # CMAKE_USE_PTHREADS_INIT - are we using pthreads # CMAKE_HP_PTHREADS_INIT - are we using hp pthreads -INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) -INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake) +INCLUDE (CheckIncludeFile) +INCLUDE (CheckLibraryExists) # Do we have sproc? IF(CMAKE_SYSTEM MATCHES IRIX) diff --git a/Modules/FindUnixCommands.cmake b/Modules/FindUnixCommands.cmake index 568f3bc46..3f64348ba 100644 --- a/Modules/FindUnixCommands.cmake +++ b/Modules/FindUnixCommands.cmake @@ -2,7 +2,7 @@ # this module looks for some usual Unix commands # -INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) +INCLUDE(FindCygwin) FIND_PROGRAM(BASH bash diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake index 519815f97..e5f7d7986 100644 --- a/Modules/FindVTK.cmake +++ b/Modules/FindVTK.cmake @@ -108,7 +108,7 @@ IF(VTK_DIR) # We found VTK 4.0 (UseVTK.cmake exists, but not VTKConfig.cmake). SET(VTK_FOUND 1) # Load settings for VTK 4.0. - INCLUDE(${CMAKE_ROOT}/Modules/UseVTKConfig40.cmake) + INCLUDE(UseVTKConfig40) ELSE(EXISTS ${VTK_DIR}/UseVTK.cmake) # We did not find VTK. SET(VTK_FOUND 0) diff --git a/Modules/FindWget.cmake b/Modules/FindWget.cmake index cf2264a3a..a94c49126 100644 --- a/Modules/FindWget.cmake +++ b/Modules/FindWget.cmake @@ -5,7 +5,7 @@ # WGET_EXECUTABLE: This variable defines the full path to the wget tool. # WGET_FOUND: True if wget has been found. -INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) +INCLUDE(FindCygwin) FIND_PROGRAM(WGET_EXECUTABLE wget diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 07a5f6626..a804b79a0 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -65,8 +65,8 @@ IF (UNIX) ENDIF(X11_X11_LIB) IF(X11_FOUND) - INCLUDE(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake) + INCLUDE(CheckFunctionExists) + INCLUDE(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index bee769fef..4557d9aac 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -1 +1 @@ -INCLUDE( ${CMAKE_ROOT}/Modules/FindwxWindows.cmake) +INCLUDE(FindwxWindows) diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake index 8c9c1d910..2a1eea434 100644 --- a/Modules/FindwxWindows.cmake +++ b/Modules/FindwxWindows.cmake @@ -38,7 +38,7 @@ ## ## # just include Use_wxWindows.cmake ## # in your projects CMakeLists.txt -## INCLUDE( ${CMAKE_ROOT}/Modules/Use_wxWindows.cmake) +## INCLUDE(Use_wxWindows) ## ## ------------------------------------------------------------------ ## Author Jan Woetzel (07/2003) diff --git a/Modules/Platform/CYGWIN-g77.cmake b/Modules/Platform/CYGWIN-g77.cmake index fd5329eee..77f4f164d 100644 --- a/Modules/Platform/CYGWIN-g77.cmake +++ b/Modules/Platform/CYGWIN-g77.cmake @@ -2,4 +2,4 @@ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") SET(CMAKE_SHARED_LIBRARY_FORTRAN_FLAGS "") SET(CMAKE_SHARED_LIBRARY_FORTRAN_FLAGS "") -INCLUDE(${CMAKE_ROOT}/Modules/Platform/g77.cmake) +INCLUDE(Platform/g77) diff --git a/Modules/TestForANSIStreamHeaders.cmake b/Modules/TestForANSIStreamHeaders.cmake index 11b18a54e..9b7d964ff 100644 --- a/Modules/TestForANSIStreamHeaders.cmake +++ b/Modules/TestForANSIStreamHeaders.cmake @@ -3,7 +3,7 @@ # # CMAKE_NO_ANSI_STREAM_HEADERS - defined accoreding to the results # -INCLUDE(${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake) +INCLUDE(CheckIncludeFileCXX) IF(NOT CMAKE_NO_ANSI_STREAM_HEADERS) CHECK_INCLUDE_FILE_CXX(iostream CMAKE_ANSI_STREAM_HEADERS) diff --git a/Modules/UseVTK40.cmake b/Modules/UseVTK40.cmake index b01e30eca..e1d5273ea 100644 --- a/Modules/UseVTK40.cmake +++ b/Modules/UseVTK40.cmake @@ -5,7 +5,7 @@ # Load the compiler settings used for VTK. IF(VTK_BUILD_SETTINGS_FILE) - INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake) + INCLUDE(CMakeImportBuildSettings) CMAKE_IMPORT_BUILD_SETTINGS(${VTK_BUILD_SETTINGS_FILE}) ENDIF(VTK_BUILD_SETTINGS_FILE) diff --git a/Modules/Use_wxWindows.cmake b/Modules/Use_wxWindows.cmake index d38c5d226..ba69dea21 100644 --- a/Modules/Use_wxWindows.cmake +++ b/Modules/Use_wxWindows.cmake @@ -8,7 +8,7 @@ ## USAGE: ## just include Use_wxWindows.cmake ## in your projects CMakeLists.txt -## INCLUDE( ${CMAKE_ROOT}/Modules/Use_wxWindows.cmake) +## INCLUDE(Use_wxWindows) ## ## if you are sure you need GL then ## SET(WXWINDOWS_USE_GL 1) @@ -18,7 +18,7 @@ -INCLUDE(${CMAKE_ROOT}/Modules/FindwxWindows.cmake) +INCLUDE(FindwxWindows) IF(WXWINDOWS_FOUND) diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake index f33aeb139..af6b0c7e1 100644 --- a/Modules/UsewxWidgets.cmake +++ b/Modules/UsewxWidgets.cmake @@ -1 +1 @@ -INCLUDE( ${CMAKE_ROOT}/Modules/Use_wxWindows.cmake) +INCLUDE(Use_wxWindows)