From 80027fe15290bf805f4fd7b82b56bda4dfc8f112 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 17 Jul 2010 17:44:31 +0200 Subject: [PATCH] Changed: #842 Removed CMake unused files --- code/ryzom/CMakeModules/FindCEGUI.cmake | 53 ----------------- code/ryzom/CMakeModules/FindCppTest.cmake | 51 ---------------- code/ryzom/CMakeModules/FindFreeType.cmake | 67 ---------------------- code/ryzom/CMakeModules/FindJpeg.cmake | 50 ---------------- 4 files changed, 221 deletions(-) delete mode 100644 code/ryzom/CMakeModules/FindCEGUI.cmake delete mode 100644 code/ryzom/CMakeModules/FindCppTest.cmake delete mode 100644 code/ryzom/CMakeModules/FindFreeType.cmake delete mode 100644 code/ryzom/CMakeModules/FindJpeg.cmake diff --git a/code/ryzom/CMakeModules/FindCEGUI.cmake b/code/ryzom/CMakeModules/FindCEGUI.cmake deleted file mode 100644 index a939ebfb7..000000000 --- a/code/ryzom/CMakeModules/FindCEGUI.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# - Locate CEGUI library -# This module defines -# CEGUI_LIBRARY, the library to link against -# CEGUI_FOUND, if false, do not try to link to CEGUI -# CEGUI_INCLUDE_DIRS, where to find headers. - -IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - # in cache already - SET(CEGUI_FIND_QUIETLY TRUE) -ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - - -FIND_PATH(CEGUI_INCLUDE_DIRS - CEGUI - PATHS - $ENV{CEGUI_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES cegui CEGUI -) - -FIND_LIBRARY(CEGUI_LIBRARY - NAMES CEGUIBase - PATHS - $ENV{CEGUI_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -GET_FILENAME_COMPONENT(CEGUI_LIB_DIR ${CEGUI_LIBRARY} PATH CACHE) - -IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - SET(CEGUI_FOUND "YES") - SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI") - IF(NOT CEGUI_FIND_QUIETLY) - MESSAGE(STATUS "Found CEGUI: ${CEGUI_LIBRARY}") - ENDIF(NOT CEGUI_FIND_QUIETLY) -ELSE(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - IF(NOT CEGUI_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find CEGUI!") - ENDIF(NOT CEGUI_FIND_QUIETLY) -ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindCppTest.cmake b/code/ryzom/CMakeModules/FindCppTest.cmake deleted file mode 100644 index 54144eb56..000000000 --- a/code/ryzom/CMakeModules/FindCppTest.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# -# Find the CppTest includes and library -# -# This module defines -# CPPTEST_INCLUDE_DIR, where to find tiff.h, etc. -# CPPTEST_LIBRARY, where to find the CppTest library. -# CPPTEST_FOUND, If false, do not try to use CppTest. - -# also defined, but not for general use are -IF(CPPTEST_LIBRARY AND CPPTEST_INCLUDE_DIR) - # in cache already - SET(CPPTEST_FIND_QUIETLY TRUE) -ENDIF(CPPTEST_LIBRARY AND CPPTEST_INCLUDE_DIR) - -FIND_PATH(CPPTEST_INCLUDE_DIR - cpptest.h - PATHS - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES cppunit -) - -FIND_LIBRARY(CPPTEST_LIBRARY - cpptest - PATHS - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(CPPTEST_LIBRARY AND CPPTEST_INCLUDE_DIR) - SET(CPPTEST_FOUND "YES") - IF(NOT CPPTEST_FIND_QUIETLY) - MESSAGE(STATUS "Found CppTest: ${CPPTEST_LIBRARY}") - ENDIF(NOT CPPTEST_FIND_QUIETLY) -ELSE(CPPTEST_LIBRARY AND CPPTEST_INCLUDE_DIR) - IF(NOT CPPTEST_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find CppTest!") - ENDIF(NOT CPPTEST_FIND_QUIETLY) -ENDIF(CPPTEST_LIBRARY AND CPPTEST_INCLUDE_DIR) - diff --git a/code/ryzom/CMakeModules/FindFreeType.cmake b/code/ryzom/CMakeModules/FindFreeType.cmake deleted file mode 100644 index 0ba439fb9..000000000 --- a/code/ryzom/CMakeModules/FindFreeType.cmake +++ /dev/null @@ -1,67 +0,0 @@ -# - Locate FreeType library -# This module defines -# FREETYPE_LIBRARY, the library to link against -# FREETYPE_FOUND, if false, do not try to link to FREETYPE -# FREETYPE_INCLUDE_DIRS, where to find headers. - -IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - # in cache already - SET(FREETYPE_FIND_QUIETLY TRUE) -ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - - -FIND_PATH(FREETYPE_INCLUDE_DIRS - freetype - PATHS - $ENV{FREETYPE_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES freetype freetype2 -) - -# ft2build.h does not reside in the freetype include dir -FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR - ft2build.h - PATHS - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -# combine both include directories into one variable -IF(FREETYPE_ADDITIONAL_INCLUDE_DIR) - SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_ADDITIONAL_INCLUDE_DIR}) -ENDIF(FREETYPE_ADDITIONAL_INCLUDE_DIR) - -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - PATHS - $ENV{FREETYPE_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - SET(FREETYPE_FOUND "YES") - IF(NOT FREETYPE_FIND_QUIETLY) - MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARY}") - ENDIF(NOT FREETYPE_FIND_QUIETLY) -ELSE(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - IF(NOT FREETYPE_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find FreeType!") - ENDIF(NOT FREETYPE_FIND_QUIETLY) -ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindJpeg.cmake b/code/ryzom/CMakeModules/FindJpeg.cmake deleted file mode 100644 index 454f0fdc2..000000000 --- a/code/ryzom/CMakeModules/FindJpeg.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# - Locate Jpeg library -# This module defines -# JPEG_LIBRARY, the library to link against -# JPEG_FOUND, if false, do not try to link to JPEG -# JPEG_INCLUDE_DIR, where to find headers. - -IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - # in cache already - SET(JPEG_FIND_QUIETLY TRUE) -ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - - -FIND_PATH(JPEG_INCLUDE_DIR - jpeglib.h - PATHS - $ENV{JPEG_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES jpeg -) - -FIND_LIBRARY(JPEG_LIBRARY - NAMES jpeg libjpeg - PATHS - $ENV{JPEG_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - SET(JPEG_FOUND "YES") - IF(NOT JPEG_FIND_QUIETLY) - MESSAGE(STATUS "Found Jpeg: ${JPEG_LIBRARY}") - ENDIF(NOT JPEG_FIND_QUIETLY) -ELSE(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - IF(NOT JPEG_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find Jpeg!") - ENDIF(NOT JPEG_FIND_QUIETLY) -ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)