From 9236f92dab75c5edc1d45066b980070290633337 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Aug 2009 13:30:28 +0000 Subject: - 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 --- CMake/macros.cmake | 10 +++--- CMakeLists.txt | 49 +++++++++------------------- extern/libopenjpeg/CMakeLists.txt | 2 +- intern/audaspace/CMakeLists.txt | 6 ++-- intern/elbeem/CMakeLists.txt | 2 +- source/blender/blenfont/CMakeLists.txt | 3 +- source/blender/blenkernel/CMakeLists.txt | 6 ---- source/blender/blenlib/CMakeLists.txt | 3 +- source/blender/editors/CMakeLists.txt | 1 - source/blender/editors/screen/CMakeLists.txt | 1 - source/blender/nodes/CMakeLists.txt | 1 - source/blender/windowmanager/CMakeLists.txt | 1 - source/gameengine/GameLogic/CMakeLists.txt | 2 +- source/gameengine/Ketsji/CMakeLists.txt | 2 +- 14 files changed, 30 insertions(+), 59 deletions(-) diff --git a/CMake/macros.cmake b/CMake/macros.cmake index ff57cf6e34b..5ad1bd6a84f 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -66,9 +66,9 @@ ENDMACRO(SETUP_LIBDIRS) MACRO(SETUP_LIBLINKS target) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ") - #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIBRARY} ${LLIBS}) - TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS}) + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${LLIBS}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions @@ -85,8 +85,8 @@ MACRO(SETUP_LIBLINKS ENDIF(WIN32) - TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB}) + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIBRARY} ${LLIBS}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions @@ -106,7 +106,7 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) - TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB}) + TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY}) ENDIF(WITH_OPENAL) IF(WIN32) TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) 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 diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index c179d5328b9..0a985aceb37 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . src ${FREETYPE_INC}) +SET(INC . src) FILE(GLOB SRC *.c except t1_generate_luts.c) ADD_DEFINITIONS(-DWITH_OPENJPEG) diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index c0716e2057c..4939e1d38d9 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -31,17 +31,17 @@ IF(WITH_FFMPEG) ENDIF(WITH_FFMPEG) IF(WITH_SDL) - SET(INC ${INC} SDL ${SDL_INC}) + SET(INC ${INC} SDL ${SDL_INCLUDE_DIR}) FILE(GLOB SDLSRC SDL/*.cpp) ADD_DEFINITIONS(-DWITH_SDL) ENDIF(WITH_SDL) IF(WITH_OPENAL) - SET(INC ${INC} OpenAL ${OPENAL_INC}) + SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR}) FILE(GLOB OPENALSRC OpenAL/*.cpp) ADD_DEFINITIONS(-DWITH_OPENAL) - STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INC}) + STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR}) IF(FRAMEWORK) ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX) ENDIF(FRAMEWORK) diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 03fd4a3fefc..8b8a3000efd 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} ${SDL_INC} extern) +SET(INC ${PNG_INC} ${ZLIB_INC} extern) FILE(GLOB SRC intern/*.cpp) diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 4784ce88dfc..bc03e69eb88 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -27,8 +27,7 @@ FILE(GLOB SRC intern/*.c) SET(INC ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include ../blenkernel ../../../extern/glew/include . - ${FTGL_INC} - ${FREETYPE_INC} + ${FREETYPE_INCLUDE_DIRS} ) IF(WITH_INTERNATIONAL) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 950947f0d24..c1dfc2cf639 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -55,12 +55,6 @@ IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) -IF(WITH_SDL) - SET(INC ${INC} ${SDL_INC}) -ELSE(WITH_SDL) - ADD_DEFINITIONS(-DDISABLE_SDL) -ENDIF(WITH_SDL) - IF(WITH_FFMPEG) SET(INC ${INC} ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 334c8e6906b..a0bf2367b98 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -28,8 +28,7 @@ FILE(GLOB SRC intern/*.c) SET(INC . ../makesdna ../blenkernel ../../../intern/guardedalloc ../include - ${FREETYPE_INC} - ${SDL_INC} + ${FREETYPE_INCLUDE_DIRS} ${ZLIB_INC} ) diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index ce9f01235a3..fc28e21ab8f 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -40,7 +40,6 @@ SET(INC ../windowmanager ../nodes ../gpu ../blenfont - ${SDL_INC} ) IF(WITH_INTERNATIONAL) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 89820e0d362..6861f82ac3f 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -41,7 +41,6 @@ SET(INC ../../windowmanager ../../quicktime ../../../../intern/elbeem/extern ../../../../intern/ghost ../../../../intern/opennl/extern ../../nodes - ${SDL_INC} ) IF(WITH_INTERNATIONAL) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 664aacf11ab..ca21ba592a8 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -31,7 +31,6 @@ SET(INC ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/iksolver/extern ../blenloader ../quicktime ../blenkernel ../../../extern/glew/include ../gpu - ${SDL_INC} ${ZLIB_INC} ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 4358eea6f1b..a268ffebffb 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -39,7 +39,6 @@ SET(INC . ../nodes ../gpu ../blenfont - ${SDL_INC} ${OPENGL_INCLUDE_DIR} ) diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 530664dce55..a1dce49e14b 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -38,7 +38,7 @@ SET(INC ) IF(WITH_SDL) - SET(INC ${INC} ${SDL_INC}) + SET(INC ${INC} ${SDL_INCLUDE_DIR}) ELSE(WITH_SDL) ADD_DEFINITIONS(-DDISABLE_SDL) ENDIF(WITH_SDL) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 47a27ff6e58..77bdd80721f 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -66,7 +66,7 @@ SET(INC ) IF(WITH_SDL) - SET(INC ${INC} ${SDL_INC}) + SET(INC ${INC} ${SDL_INCLUDE_DIR}) ELSE(WITH_SDL) ADD_DEFINITIONS(-DDISABLE_SDL) ENDIF(WITH_SDL) -- cgit v1.2.3