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:
authorNick Samarin <nicks1987@bigmir.net>2011-02-16 19:47:48 +0300
committerNick Samarin <nicks1987@bigmir.net>2011-02-16 19:47:48 +0300
commitea7353dcd76f114ca80ec749a554c7320f54f3af (patch)
tree5a4bf61a9b7c2fbc7943a77ef080df8f4c536d39 /extern/CMakeLists.txt
parent0a1562f2aadc76b30b805c6e6aededc4b42213ba (diff)
parent9e9e028f059f29d493dc020dda965a9bea8ffd6b (diff)
synched with trunk at revision 34793
Diffstat (limited to 'extern/CMakeLists.txt')
-rw-r--r--extern/CMakeLists.txt42
1 files changed, 25 insertions, 17 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 79d615ba730..6ce49942795 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -24,25 +24,33 @@
#
# ***** END GPL LICENSE BLOCK *****
-IF(WITH_BULLET)
- ADD_SUBDIRECTORY(bullet2)
-ENDIF(WITH_BULLET)
+# Otherwise we get warnings here that we cant fix in external projects
+remove_strict_flags()
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- ADD_SUBDIRECTORY(binreloc)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(WITH_BULLET)
+ add_subdirectory(bullet2)
+endif()
-ADD_SUBDIRECTORY(glew)
-ADD_SUBDIRECTORY(recastnavigation)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ add_subdirectory(binreloc)
+endif()
-IF(WITH_IMAGE_OPENJPEG)
- ADD_SUBDIRECTORY(libopenjpeg)
-ENDIF(WITH_IMAGE_OPENJPEG)
+add_subdirectory(glew)
+add_subdirectory(recastnavigation)
-IF(WITH_LZO)
- ADD_SUBDIRECTORY(lzo)
-ENDIF(WITH_LZO)
-IF(WITH_LZMA)
- ADD_SUBDIRECTORY(lzma)
-ENDIF(WITH_LZMA)
+if(WITH_IMAGE_OPENJPEG)
+ add_subdirectory(libopenjpeg)
+endif()
+
+if(WITH_IMAGE_REDCODE)
+ add_subdirectory(libredcode)
+endif()
+
+if(WITH_LZO)
+ add_subdirectory(lzo)
+endif()
+
+if(WITH_LZMA)
+ add_subdirectory(lzma)
+endif()