Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-12-08 11:43:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-12-08 11:43:06 +0300
commitafacd184982e58a9c830a3d5366e25983939a7ba (patch)
tree311ee6e5abfcda32e3cbad133276512d68abe25b /source/gameengine/Physics
parent70df57df0f82be3966a09c8548bfde23fd5c17c4 (diff)
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
Diffstat (limited to 'source/gameengine/Physics')
-rw-r--r--source/gameengine/Physics/Bullet/CMakeLists.txt14
-rw-r--r--source/gameengine/Physics/Dummy/CMakeLists.txt6
-rw-r--r--source/gameengine/Physics/common/CMakeLists.txt6
3 files changed, 13 insertions, 13 deletions
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 7a48c774cb9..da585803783 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -25,9 +25,9 @@
# ***** END GPL LICENSE BLOCK *****
# since this includes bullet we get errors from the headers too
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
-SET(INC
+set(INC
.
../common
../../../../extern/bullet2/src
@@ -47,7 +47,7 @@ SET(INC
${PYTHON_INC}
)
-SET(SRC
+set(SRC
CcdPhysicsEnvironment.cpp
CcdPhysicsController.cpp
CcdGraphicController.cpp
@@ -57,8 +57,8 @@ SET(SRC
CcdPhysicsEnvironment.h
)
-IF(WITH_BULLET)
- ADD_DEFINITIONS(-DUSE_BULLET)
-ENDIF(WITH_BULLET)
+if(WITH_BULLET)
+ add_definitions(-DUSE_BULLET)
+endif()
-BLENDERLIB(ge_phys_bullet "${SRC}" "${INC}")
+blenderlib(ge_phys_bullet "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index 0e852f50c76..ab633b807e0 100644
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -24,15 +24,15 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC
+set(INC
.
../common
)
-SET(SRC
+set(SRC
DummyPhysicsEnvironment.cpp
DummyPhysicsEnvironment.h
)
-BLENDERLIB(ge_phys_dummy "${SRC}" "${INC}")
+blenderlib(ge_phys_dummy "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index aacb497674d..bc095822936 100644
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -24,12 +24,12 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC
+set(INC
.
../Dummy
)
-SET(SRC
+set(SRC
PHY_IMotionState.cpp
PHY_IController.cpp
PHY_IPhysicsController.cpp
@@ -47,4 +47,4 @@ SET(SRC
PHY_Pro.h
)
-BLENDERLIB(ge_phys_common "${SRC}" "${INC}")
+blenderlib(ge_phys_common "${SRC}" "${INC}")