[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21707] branches/blender2.5/blender: binreloc wasnt working with cmake.

[Campbell Barton]

Revision: 21707
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21707
Author:   campbellbarton
Date:     2009-07-19 21:36:56 +0200 (Sun, 19 Jul 2009)

Log Message:
-----------
binreloc wasnt working with cmake.

Modified Paths:
--------------
    branches/blender2.5/blender/blenderplayer/CMakeLists.txt
    branches/blender2.5/blender/extern/binreloc/CMakeLists.txt
    branches/blender2.5/blender/extern/binreloc/Makefile
    branches/blender2.5/blender/source/creator/CMakeLists.txt

Modified: branches/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt	2009-07-19 18:51:25 UTC (rev 21706)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt	2009-07-19 19:36:56 UTC (rev 21707)
@@ -32,10 +32,10 @@
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c

Modified: branches/blender2.5/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/extern/binreloc/CMakeLists.txt	2009-07-19 18:51:25 UTC (rev 21706)
+++ branches/blender2.5/blender/extern/binreloc/CMakeLists.txt	2009-07-19 19:36:56 UTC (rev 21707)
@@ -18,8 +18,8 @@
 # All rights reserved.
 #
 
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
+SET(INC ./include )
+ADD_DEFINITIONS(-DENABLE_BINRELOC)
 FILE(GLOB SRC *.c)
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")

Modified: branches/blender2.5/blender/extern/binreloc/Makefile
===================================================================
--- branches/blender2.5/blender/extern/binreloc/Makefile	2009-07-19 18:51:25 UTC (rev 21706)
+++ branches/blender2.5/blender/extern/binreloc/Makefile	2009-07-19 19:36:56 UTC (rev 21707)
@@ -27,7 +27,7 @@
 
 include nan_definitions.mk
 
-CPPFLAGS += -I./include
+CPPFLAGS += -DENABLE_BINRELOC -I./include
 
 
 include nan_compile.mk

Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-07-19 18:51:25 UTC (rev 21706)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-07-19 19:36:56 UTC (rev 21707)
@@ -62,10 +62,10 @@
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 MESSAGE(STATUS "Configuring blender")