Commit ad4f98f3 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

ENH: Cleanup. Use relative path to modules

parent c9eaf386
# 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.")
......
......@@ -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)
......
......@@ -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.
......
......@@ -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)
......
......@@ -4,7 +4,7 @@
#
#
INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
INCLUDE(FindOpenGL)
IF (OPENGL_GLU_FOUND)
SET (GLU_LIBRARY ${OPENGL_LIBRARIES})
......
......@@ -2,7 +2,7 @@
# this module looks for gnuplot
#
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
INCLUDE(FindCygwin)
FIND_PROGRAM(GNUPLOT
NAMES
......
......@@ -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})
......
......@@ -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)
......@@ -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)
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -2,7 +2,7 @@
# this module looks for some usual Unix commands
#
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
INCLUDE(FindCygwin)
FIND_PROGRAM(BASH
bash
......
......@@ -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)
......
......@@ -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
......
......@@ -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.
......
INCLUDE( ${CMAKE_ROOT}/Modules/FindwxWindows.cmake)
INCLUDE(FindwxWindows)
......@@ -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 <http://www.mip.informatik.uni-kiel.de/~jw> (07/2003)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment