From 710843e4dfd146257500be7ad9c0a5c0d61e56c4 Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Wed, 4 Nov 2009 18:01:25 +0100 Subject: Use PkgConfig where possible TODO: gettext, SDL_ttf Drop windows bundled libs, since .pc should be able to pick them up on windows too. --- cmake/FindCairo.cmake | 46 ------------ cmake/FindFontconfig.cmake | 56 -------------- cmake/FindGZIP.cmake | 14 ---- cmake/FindOpenGL.cmake | 145 ------------------------------------ cmake/FindSDL.cmake | 178 --------------------------------------------- cmake/FindSDL_image.cmake | 64 ---------------- cmake/FindSDL_mixer.cmake | 64 ---------------- cmake/FindZIP.cmake | 42 ----------- 8 files changed, 609 deletions(-) delete mode 100644 cmake/FindCairo.cmake delete mode 100644 cmake/FindFontconfig.cmake delete mode 100644 cmake/FindGZIP.cmake delete mode 100644 cmake/FindOpenGL.cmake delete mode 100644 cmake/FindSDL.cmake delete mode 100644 cmake/FindSDL_image.cmake delete mode 100644 cmake/FindSDL_mixer.cmake delete mode 100644 cmake/FindZIP.cmake (limited to 'cmake') diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake deleted file mode 100644 index 22ace55..0000000 --- a/cmake/FindCairo.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# - try to find Cairo -# Once done this will define -# -# CAIRO_FOUND - system has Cairo -# CAIRO_LIBRARIES - Link these to use Cairo -# CAIRO_INCLUDE_DIR - where to find zip.h, etc. -# -# Copyright (c) 2007, Pino Toscano, -# Copyright (c) 2009, Tomas Chvatal, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -IF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIR) - # Already in cache, be silent - SET(CAIRO_FIND_QUIETLY TRUE) -ELSE(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIR) - # we need the svg cairo part so why not :] - # normally we should search for cairo.h only - FIND_PATH ( CAIRO_INCLUDE_DIR cairo-svg.h - PATH_SUFFIXES cairo - PATHS - /usr/local/include - /usr/include - NO_DEFAULT_PATH - ) - FIND_LIBRARY ( CAIRO_LIBRARIES cairo - PATH_SUFFIXES lib64 lib - PATHS - /usr/local - /usr - NO_DEFAULT_PATH - ) - # handle the QUIETLY and REQUIRED arguments and set CAIRO_FOUND to TRUE if - # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(CAIRO DEFAULT_MSG CAIRO_LIBRARIES CAIRO_INCLUDE_DIR) - IF(NOT CAIRO_FOUND) - IF(CAIRO_REQUIRED) - MESSAGE(FATAL_ERROR "libcairo not found") - ENDIF(CAIRO_REQUIRED) - SET(CAIRO_LIBRARIES) - ENDIF(NOT CAIRO_FOUND) -ENDIF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIR) - -MARK_AS_ADVANCED( CAIRO_LIBRARIES CAIRO_INCLUDE_DIR ) diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake deleted file mode 100644 index 3125c73..0000000 --- a/cmake/FindFontconfig.cmake +++ /dev/null @@ -1,56 +0,0 @@ -# - Try to find the Fontconfig -# Once done this will define -# -# FONTCONFIG_FOUND - system has Fontconfig -# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers -# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG -# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG - -# Copyright (c) 2006,2007 Laurent Montel, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) - - # in cache already - set(FONTCONFIG_FOUND TRUE) - -else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) - - if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_FONTCONFIG fontconfig) - - set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) - endif (NOT WIN32) - - find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h - PATHS - ${PC_FONTCONFIG_INCLUDEDIR} - ${PC_FONTCONFIG_INCLUDE_DIRS} - /usr/X11/include - ) - - find_library(FONTCONFIG_LIBRARIES NAMES fontconfig - PATHS - ${PC_FONTCONFIG_LIBDIR} - ${PC_FONTCONFIG_LIBRARY_DIRS} - ) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) - - IF(NOT FONTCONFIG_FOUND) - IF(FONTCONFIG_REQUIRED) - MESSAGE(FATAL_ERROR "fontconfig not found") - ENDIF(FONTCONFIG_REQUIRED) - ENDIF(NOT FONTCONFIG_FOUND) - - mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR) - -endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) - diff --git a/cmake/FindGZIP.cmake b/cmake/FindGZIP.cmake deleted file mode 100644 index ca15d5a..0000000 --- a/cmake/FindGZIP.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# This scripts search up bzip2 binary and put it to the -# GZIP_TOOL varable. -FIND_PROGRAM(GZIP_TOOL - NAMES gzip - PATHS - /bin - /usr/bin - /usr/local/bin -) -IF(NOT GZIP_TOOL) - IF(GZIP_REQUIRED) - MESSAGE(FATAL_ERROR "Unable to find 'gzip' executable") - ENDIF(GZIP_REQUIRED) -ENDIF(NOT GZIP_TOOL) diff --git a/cmake/FindOpenGL.cmake b/cmake/FindOpenGL.cmake deleted file mode 100644 index 4e6191e..0000000 --- a/cmake/FindOpenGL.cmake +++ /dev/null @@ -1,145 +0,0 @@ -# - Try to find OpenGL -# Once done this will define -# -# OPENGL_FOUND - system has OpenGL -# OPENGL_XMESA_FOUND - system has XMESA -# OPENGL_GLU_FOUND - system has GLU -# OPENGL_INCLUDE_DIR - the GL include directory -# OPENGL_LIBRARIES - Link these to use OpenGL and GLU -# -# If you want to use just GL you can use these values -# OPENGL_gl_LIBRARY - Path to OpenGL Library -# OPENGL_glu_LIBRARY - Path to GLU Library -# -# On OSX default to using the framework version of opengl -# People will have to change the cache values of OPENGL_glu_LIBRARY -# and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX - -IF (WIN32) - IF (CYGWIN) - - FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h ) - - FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 ) - - FIND_LIBRARY(OPENGL_glu_LIBRARY glu32 ) - - ELSE (CYGWIN) - - IF(BORLAND) - SET (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32") - SET (OPENGL_glu_LIBRARY import32 CACHE STRING "GLU library for win32") - ELSE(BORLAND) - SET (OPENGL_gl_LIBRARY opengl32 CACHE STRING "OpenGL library for win32") - SET (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32") - ENDIF(BORLAND) - - ENDIF (CYGWIN) - -ELSE (WIN32) - - IF (APPLE) - - FIND_LIBRARY(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX") - FIND_LIBRARY(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX") - FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX") - - ELSE(APPLE) - - # The first line below is to make sure that the proper headers - # are used on a Linux machine with the NVidia drivers installed. - # They replace Mesa with NVidia's own library but normally do not - # install headers and that causes the linking to - # fail since the compiler finds the Mesa headers but NVidia's library. - # Make sure the NVIDIA directory comes BEFORE the others. - # - Atanas Georgiev - - FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include - ) - - FIND_LIBRARY(OPENGL_gl_LIBRARY - NAMES GL MesaGL - PATHS /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ) - - # On Unix OpenGL most certainly always requires X11. - # Feel free to tighten up these conditions if you don't - # think this is always true. - # It's not true on OSX. - - IF (OPENGL_gl_LIBRARY) - IF(NOT X11_FOUND) - INCLUDE(FindX11) - ENDIF(NOT X11_FOUND) - IF (X11_FOUND) - IF (NOT APPLE) - SET (OPENGL_LIBRARIES ${X11_LIBRARIES}) - ENDIF (NOT APPLE) - ENDIF (X11_FOUND) - ENDIF (OPENGL_gl_LIBRARY) - - FIND_LIBRARY(OPENGL_glu_LIBRARY - NAMES GLU MesaGLU - PATHS ${OPENGL_gl_LIBRARY} - /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ) - - ENDIF(APPLE) -ENDIF (WIN32) - -SET( OPENGL_FOUND "NO" ) -IF(OPENGL_gl_LIBRARY) - - IF(OPENGL_xmesa_INCLUDE_DIR) - SET( OPENGL_XMESA_FOUND "YES" ) - ELSE(OPENGL_xmesa_INCLUDE_DIR) - SET( OPENGL_XMESA_FOUND "NO" ) - ENDIF(OPENGL_xmesa_INCLUDE_DIR) - - SET( OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES}) - IF(OPENGL_glu_LIBRARY) - SET( OPENGL_GLU_FOUND "YES" ) - SET( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES} ) - ELSE(OPENGL_glu_LIBRARY) - SET( OPENGL_GLU_FOUND "NO" ) - ENDIF(OPENGL_glu_LIBRARY) - - SET( OPENGL_FOUND "YES" ) - - # This deprecated setting is for backward compatibility with CMake1.4 - - SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) - -ENDIF(OPENGL_gl_LIBRARY) - -IF (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR) - SET(OPENGL_FOUND TRUE) -ELSE (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR) - SET(OPENGL_FOUND FALSE) - IF(OPENGL_REQUIRED) - MESSAGE(FATAL_ERROR "OPENGL not found") - ENDIF(OPENGL_REQUIRED) -ENDIF (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR) - -# This deprecated setting is for backward compatibility with CMake1.4 -SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) - -MARK_AS_ADVANCED( - OPENGL_INCLUDE_DIR - OPENGL_xmesa_INCLUDE_DIR - OPENGL_glu_LIBRARY - OPENGL_gl_LIBRARY -) diff --git a/cmake/FindSDL.cmake b/cmake/FindSDL.cmake deleted file mode 100644 index 5240357..0000000 --- a/cmake/FindSDL.cmake +++ /dev/null @@ -1,178 +0,0 @@ -# Locate SDL library -# This module defines -# SDL_LIBRARY, the name of the library to link against -# SDL_FOUND, if false, do not try to link to SDL -# SDL_INCLUDE_DIR, where to find SDL.h -# -# This module responds to the the flag: -# SDL_BUILDING_LIBRARY -# If this is defined, then no SDL_main will be linked in because -# only applications need main(). -# Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the the proper link flags -# as part of the returned SDL_LIBRARY variable. -# -# Don't forget to include SDLmain.h and SDLmain.m your project for the -# OS X framework based version. (Other versions link to -lSDLmain which -# this module will try to find on your behalf.) Also for OS X, this -# module will automatically add the -framework Cocoa on your behalf. -# -# -# Additional Note: If you see an empty SDL_LIBRARY_TEMP in your configuration -# and no SDL_LIBRARY, it means CMake did not find your SDL library -# (SDL.dll, libsdl.so, SDL.framework, etc). -# Set SDL_LIBRARY_TEMP to point to your SDL library, and configure again. -# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this value -# as appropriate. These values are used to generate the final SDL_LIBRARY -# variable, but when these values are unset, SDL_LIBRARY does not get created. -# -# -# $SDLDIR is an environment variable that would -# correspond to the ./configure --prefix=$SDLDIR -# used in building SDL. -# l.e.galup 9-20-02 -# -# Modified by Eric Wing. -# Added code to assist with automated building by using environmental variables -# and providing a more controlled/consistent search behavior. -# Added new modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). -# Also corrected the header search path to follow "proper" SDL guidelines. -# Added a search for SDLmain which is needed by some platforms. -# Added a search for threads which is needed by some platforms. -# Added needed compile switches for MinGW. -# -# On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of -# SDL_LIBRARY to override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. -# -# Note that the header path has changed from SDL/SDL.h to just SDL.h -# This needed to change because "proper" SDL convention -# is #include "SDL.h", not . This is done for portability -# reasons because not all systems place things in SDL/ (see FreeBSD). - -FIND_PATH(SDL_INCLUDE_DIR SDL.h - HINTS - $ENV{SDLDIR} - PATH_SUFFIXES include - PATHS - ~/Library/Frameworks - /Library/Frameworks - /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 - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci -) -#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") - -# SDL-1.1 is the name used by FreeBSD ports... -# don't confuse it for the version number. -FIND_LIBRARY(SDL_LIBRARY_TEMP - NAMES SDL SDL-1.1 - HINTS - $ENV{SDLDIR} - PATH_SUFFIXES lib64 lib - PATHS - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt -) - -#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") - -IF(NOT SDL_BUILDING_LIBRARY) - IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") - # Non-OS X framework versions expect you to also dynamically link to - # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms - # seem to provide SDLmain for compatibility even though they don't - # necessarily need it. - FIND_LIBRARY(SDLMAIN_LIBRARY - NAMES SDLmain SDLmain-1.1 - HINTS - $ENV{SDLDIR} - PATH_SUFFIXES lib64 lib - PATHS - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ - ) - ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") -ENDIF(NOT SDL_BUILDING_LIBRARY) - -# SDL may require threads on your system. -# The Apple build may not need an explicit flag because one of the -# frameworks may already provide it. -# But for non-OSX systems, I will use the CMake Threads package. -IF(NOT APPLE) - FIND_PACKAGE(Threads) -ENDIF(NOT APPLE) - -# MinGW needs an additional library, mwindows -# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows -# (Actually on second look, I think it only needs one of the m* libraries.) -IF(MINGW) - SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") -ENDIF(MINGW) - -SET(SDL_FOUND "NO") -IF(SDL_LIBRARY_TEMP) - # For SDLmain - IF(NOT SDL_BUILDING_LIBRARY) - IF(SDLMAIN_LIBRARY) - SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP}) - ENDIF(SDLMAIN_LIBRARY) - ENDIF(NOT SDL_BUILDING_LIBRARY) - - # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. - # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. - # I think it has something to do with the CACHE STRING. - # So I use a temporary variable until the end so I can set the - # "real" variable in one-shot. - IF(APPLE) - SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa") - ENDIF(APPLE) - - # For threads, as mentioned Apple doesn't need this. - # In fact, there seems to be a problem if I used the Threads package - # and try using this line, so I'm just skipping it entirely for OS X. - IF(NOT APPLE) - SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(NOT APPLE) - - # For MinGW library - IF(MINGW) - SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP}) - ENDIF(MINGW) - - # 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 the temp variable to INTERNAL so it is not seen in the CMake GUI - SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "") - - SET(SDL_FOUND "YES") -ENDIF(SDL_LIBRARY_TEMP) - -#MESSAGE("SDL_LIBRARY is ${SDL_LIBRARY}") - diff --git a/cmake/FindSDL_image.cmake b/cmake/FindSDL_image.cmake deleted file mode 100644 index a6dddf6..0000000 --- a/cmake/FindSDL_image.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# Locate SDL_image library -# This module defines -# SDLIMAGE_LIBRARY, the name of the library to link against -# SDLIMAGE_FOUND, if false, do not try to link to SDL -# SDLIMAGE_INCLUDE_DIR, where to find SDL/SDL.h -# -# $SDLDIR is an environment variable that would -# correspond to the ./configure --prefix=$SDLDIR -# used in building SDL. -# -# Created by Eric Wing. This was influenced by the FindSDL.cmake -# module, but with modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). - -FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h - HINTS - $ENV{SDLIMAGEDIR} - $ENV{SDLDIR} - PATH_SUFFIXES include - PATHS - ~/Library/Frameworks - /Library/Frameworks - /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 - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci -) - -FIND_LIBRARY(SDLIMAGE_LIBRARY - NAMES SDL_image - HINTS - $ENV{SDLIMAGEDIR} - $ENV{SDLDIR} - PATH_SUFFIXES lib64 lib - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ -) - -SET(SDLIMAGE_FOUND "NO") -IF(SDLIMAGE_LIBRARY AND SDLIMAGE_INCLUDE_DIR) - SET(SDLIMAGE_FOUND "YES") -ENDIF(SDLIMAGE_LIBRARY AND SDLIMAGE_INCLUDE_DIR) - diff --git a/cmake/FindSDL_mixer.cmake b/cmake/FindSDL_mixer.cmake deleted file mode 100644 index f491d02..0000000 --- a/cmake/FindSDL_mixer.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# Locate SDL_mixer library -# This module defines -# SDLMIXER_LIBRARY, the name of the library to link against -# SDLMIXER_FOUND, if false, do not try to link to SDL -# SDLMIXER_INCLUDE_DIR, where to find SDL/SDL.h -# -# $SDLDIR is an environment variable that would -# correspond to the ./configure --prefix=$SDLDIR -# used in building SDL. -# -# Created by Eric Wing. This was influenced by the FindSDL.cmake -# module, but with modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). - -FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h - HINTS - $ENV{SDLMIXERDIR} - $ENV{SDLDIR} - PATH_SUFFIXES include - PATHS - ~/Library/Frameworks - /Library/Frameworks - /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 - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci -) - -FIND_LIBRARY(SDLMIXER_LIBRARY - NAMES SDL_mixer - HINTS - $ENV{SDLMIXERDIR} - $ENV{SDLDIR} - PATH_SUFFIXES lib64 lib - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ -) - -SET(SDLMIXER_FOUND "NO") -IF(SDLMIXER_LIBRARY AND SDLMIXER_INCLUDE_DIR) - SET(SDLMIXER_FOUND "YES") -ENDIF(SDLMIXER_LIBRARY AND SDLMIXER_INCLUDE_DIR) - diff --git a/cmake/FindZIP.cmake b/cmake/FindZIP.cmake deleted file mode 100644 index bbc3765..0000000 --- a/cmake/FindZIP.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# - Find zip -# Find the native ZIP includes and library -# -# ZIP_INCLUDE_DIR - where to find zip.h, etc. -# ZIP_LIBRARIES - List of libraries when using zip. -# ZIP_FOUND - True if zip found. - - -IF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) - # Already in cache, be silent - SET(ZIP_FIND_QUIETLY TRUE) -ELSE(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) - FIND_PATH(ZIP_INCLUDE_DIR zip.h - PATHS - /usr/local/include - /usr/include - ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/include - NO_DEFAULT_PATH - ) - - FIND_LIBRARY(ZIP_LIBRARIES NAMES zip zip-1 - PATH_SUFFIXES lib64 lib - PATHS - /usr/local - /usr - ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/ - ) - - # handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if - # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARIES ZIP_INCLUDE_DIR) - - IF(NOT ZIP_FOUND) - IF(ZIP_REQUIRED) - MESSAGE(FATAL_ERROR "libzip not found") - ENDIF(ZIP_REQUIRED) - SET(ZIP_LIBRARIES) - ENDIF(NOT ZIP_FOUND) -ENDIF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) - -MARK_AS_ADVANCED( ZIP_LIBRARIES ZIP_INCLUDE_DIR ) -- cgit v1.2.3