diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-15 17:30:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-15 17:30:28 +0400 |
commit | 9236f92dab75c5edc1d45066b980070290633337 (patch) | |
tree | 574457f8719eff64286903d82b00c549cd05ed2d /CMakeLists.txt | |
parent | 9c45a27fb8d3605db8e82d9e73ccaf2074a607fe (diff) |
- remove UNSET becuase it only works with newer versions of cmake,
- changed the SDL and Freetype vars to match CMake's names
- removed unneeded freetype, SDL and ftgl includes
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 49 |
1 files changed, 16 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e552be8616..974067383d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,10 +95,6 @@ IF(UNIX AND NOT APPLE) FIND_PACKAGE(OpenAL) IF(OPENAL_FOUND) SET(WITH_OPENAL ON) - SET(OPENAL_LIB ${OPENAL_LIBRARY}) - SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) - UNSET(OPENAL_LIBRARY CACHE) - UNSET(OPENAL_INCLUDE_DIR CACHE) ELSE(OPENAL_FOUND) SET(WITH_OPENAL OFF) ENDIF(OPENAL_FOUND) @@ -120,11 +116,7 @@ IF(UNIX AND NOT APPLE) ENDIF(INTL_LIBRARY AND ICONV_LIBRARY) FIND_PACKAGE(Freetype) - SET(FREETYPE_INC "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE STRING "") - SET(FREETYPE_LIB "${FREETYPE_LIBRARY}" CACHE STRING "") - UNSET(FREETYPE_INCLUDE_DIR_freetype2 CACHE) - UNSET(FREETYPE_LIBRARY CACHE) - UNSET(FREETYPE_INCLUDE_DIR_ft2build CACHE) + # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use # No way to set py31. remove for now. # FIND_PACKAGE(PythonLibs) @@ -142,15 +134,10 @@ IF(UNIX AND NOT APPLE) IF(WITH_SDL) FIND_PACKAGE(SDL) - IF(SDL_FOUND) - SET(SDL_INC ${SDL_INCLUDE_DIR}) - SET(SDL_LIB ${SDL_LIBRARY}) - UNSET(SDL_INCLUDE_DIR CACHE) - UNSET(SDL_LIBRARY CACHE) - UNSET(SDLMAIN_LIBRARY CACHE) - ELSE(SDL_FOUND) + # UNSET(SDLMAIN_LIBRARY CACHE) + IF(NOT SDL_FOUND) SET(WITH_SDL OFF) - ENDIF(SDL_FOUND) + ENDIF(NOT SDL_FOUND) ENDIF(WITH_SDL) FIND_PATH(OPENEXR_INC @@ -238,8 +225,8 @@ IF(WIN32) ELSE(CMAKE_CL_64) #SET(WITH_OPENAL ON) SET(OPENAL ${LIBDIR}/openal) - SET(OPENAL_INC ${OPENAL}/include) - SET(OPENAL_LIB wrap_oal) + SET(OPENAL_INCLUDE_DIR ${OPENAL}/include) + SET(OPENAL_LIBRARY wrap_oal) SET(OPENAL_LIBPATH ${OPENAL}/lib) ENDIF(CMAKE_CL_64) @@ -282,9 +269,9 @@ IF(WIN32) SET(GETTEXT_LIBPATH ${GETTEXT}/lib) SET(FREETYPE ${LIBDIR}/freetype) - SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2) + SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2) SET(FREETYPE_LIBPATH ${FREETYPE}/lib) - SET(FREETYPE_LIB freetype2ST) + SET(FREETYPE_LIBRARY freetype2ST) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath) @@ -335,8 +322,8 @@ IF(WIN32) ENDIF(WITH_OPENMP) SET(SDL ${LIBDIR}/sdl) - SET(SDL_INC ${SDL}/include) - SET(SDL_LIB SDL) + SET(SDL_INCLUDE_DIR ${SDL}/include) + SET(SDL_LIBRARY SDL) SET(SDL_LIBPATH ${SDL}/lib) SET(PNG "${LIBDIR}/png") @@ -371,10 +358,6 @@ IF(APPLE) FIND_PACKAGE(OpenAL) IF(OPENAL_FOUND) SET(WITH_OPENAL ON) - SET(OPENAL_LIB ${OPENAL_LIBRARY}) - SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) - UNSET(OPENAL_LIBRARY CACHE) - UNSET(OPENAL_INCLUDE_DIR CACHE) ELSE(OPENAL_FOUND) SET(WITH_OPENAL OFF) ENDIF(OPENAL_FOUND) @@ -424,9 +407,9 @@ IF(APPLE) SET(ZLIB_LIBRARIES z) SET(FREETYPE ${LIBDIR}/freetype) - SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2) + SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2) SET(FREETYPE_LIBPATH ${FREETYPE}/lib) - SET(FREETYPE_LIB freetype) + SET(FREETYPE_LIBRARY freetype) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include) @@ -455,8 +438,8 @@ IF(APPLE) ENDIF(WITH_OPENMP) SET(SDL ${LIBDIR}/sdl) - SET(SDL_INC ${SDL}/include) - SET(SDL_LIB SDL) + SET(SDL_INCLUDE_DIR ${SDL}/include) + SET(SDL_LIBRARY SDL) SET(SDL_LIBPATH ${SDL}/lib) SET(PNG "${LIBDIR}/png") @@ -500,8 +483,8 @@ ENDIF(WITH_WEBPLUGIN) # Configure OpenGL. FIND_PACKAGE(OpenGL) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) -UNSET(OPENGL_LIBRARIES CACHE) -UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) +# UNSET(OPENGL_LIBRARIES CACHE) # not compat with older cmake +# UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake #----------------------------------------------------------------------------- # Extra compile flags |