[Bf-blender-cvs] [4aae93b] cycles-ptex-08: Update CMakeLists for ptex

Nicholas Bishop noreply at git.blender.org
Tue Jan 20 13:57:08 CET 2015


Commit: 4aae93b4c0b6ce0fd7d552482769a4fa9bc87e35
Author: Nicholas Bishop
Date:   Fri Jan 16 12:11:28 2015 +0100
Branches: cycles-ptex-08
https://developer.blender.org/rB4aae93b4c0b6ce0fd7d552482769a4fa9bc87e35

Update CMakeLists for ptex

===================================================================

M	build_files/cmake/macros.cmake
M	extern/CMakeLists.txt
A	extern/ptex/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index ecdb1d0..9b6bd98 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -569,6 +569,7 @@ macro(SETUP_BLENDER_SORTED_LIBS)
 		extern_libmv
 		extern_glog
 		extern_sdlew
+		extern_ptex
 
 		bf_intern_glew_mx
 	)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 0ea8aa1..7284f76 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -94,3 +94,7 @@ endif()
 if(WITH_SDL AND WITH_SDL_DYNLOAD)
 	add_subdirectory(sdlew)
 endif()
+
+# if(WITH_PTEX)
+	add_subdirectory(ptex)
+# endif()
\ No newline at end of file
diff --git a/extern/ptex/CMakeLists.txt b/extern/ptex/CMakeLists.txt
new file mode 100644
index 0000000..7e7bcd0
--- /dev/null
+++ b/extern/ptex/CMakeLists.txt
@@ -0,0 +1,62 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+)
+
+set(INC_SYS
+)
+
+set(SRC
+	src/ptex/PtexCache.h
+	src/ptex/PtexDict.h
+	src/ptex/PtexHalf.h
+	src/ptex/PtexHashMap.h
+	src/ptex/PtexInt.h
+	src/ptex/PtexIO.h
+	src/ptex/PtexMutex.h
+	src/ptex/PtexPlatform.h
+	src/ptex/PtexReader.h
+	src/ptex/PtexSeparableFilter.h
+	src/ptex/PtexSeparableKernel.h
+	src/ptex/PtexTriangleFilter.h
+	src/ptex/PtexTriangleKernel.h
+	src/ptex/Ptexture.h
+	src/ptex/PtexUtils.h
+	src/ptex/PtexWriter.h
+
+	src/ptex/PtexCache.cpp
+	src/ptex/PtexFilters.cpp
+	src/ptex/PtexHalf.cpp
+	src/ptex/PtexReader.cpp
+	src/ptex/PtexSeparableFilter.cpp
+	src/ptex/PtexSeparableKernel.cpp
+	src/ptex/PtexTriangleFilter.cpp
+	src/ptex/PtexTriangleKernel.cpp
+	src/ptex/PtexUtils.cpp
+	src/ptex/PtexWriter.cpp
+)
+
+blender_add_lib(extern_ptex "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list