- 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

9 files changed, 4 insertions, 16 deletions

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)