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
path: root/source
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2009-11-11 03:02:49 +0300
committerErwin Coumans <blender@erwincoumans.com>2009-11-11 03:02:49 +0300
commit925640861236c70174ddaba32a3334eadca70ec5 (patch)
tree9fe2e7cdd5c4c847658bdb91f3bb3805b7a64d24 /source
parent21385eb4ec03ff07559fbf73722955d39c77bba8 (diff)
Fix CMake build system for Windows
Add support for OPTION WITH_OPENCOLLADA for Windows
Diffstat (limited to 'source')
-rw-r--r--source/blender/collada/CMakeLists.txt8
-rw-r--r--source/blender/render/CMakeLists.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index f510e7ee9ad..a0a4fb78b9b 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -53,10 +53,10 @@ SET(INC
../makesrna
../editors/include
../../../intern/guardedalloc
- ${OPENCOLLADA}/COLLADAStreamWriter/include
- ${OPENCOLLADA}/COLLADABaseUtils/include
- ${OPENCOLLADA}/COLLADAFramework/include
- ${OPENCOLLADA}/COLLADASaxFrameworkLoader/include
+ ${OPENCOLLADA_INC}/COLLADAStreamWriter/include
+ ${OPENCOLLADA_INC}/COLLADABaseUtils/include
+ ${OPENCOLLADA_INC}/COLLADAFramework/include
+ ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include
)
ENDIF(APPLE)
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 294e1966711..40f697c7776 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -48,10 +48,10 @@ IF(WITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
IF(APPLE)
- IF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+ IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
- ENDIF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
ENDIF(APPLE)
#TODO