[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29335] branches/soc-2010-rohith291991/ intern: update to comiso
Rohith B V
rohith291991 at gmail.com
Tue Jun 8 12:31:12 CEST 2010
Revision: 29335
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29335
Author: rohith291991
Date: 2010-06-08 12:31:12 +0200 (Tue, 08 Jun 2010)
Log Message:
-----------
update to comiso
Modified Paths:
--------------
branches/soc-2010-rohith291991/intern/SConscript
Added Paths:
-----------
branches/soc-2010-rohith291991/intern/comiso/
branches/soc-2010-rohith291991/intern/comiso/CMakeLists.txt
branches/soc-2010-rohith291991/intern/comiso/COPYING
branches/soc-2010-rohith291991/intern/comiso/CoMISo.cmake
branches/soc-2010-rohith291991/intern/comiso/Makefile
branches/soc-2010-rohith291991/intern/comiso/SConscript
branches/soc-2010-rohith291991/intern/comiso/VERSION
branches/soc-2010-rohith291991/intern/comiso/extern/
branches/soc-2010-rohith291991/intern/comiso/extern/comiso.h
branches/soc-2010-rohith291991/intern/comiso/intern/
branches/soc-2010-rohith291991/intern/comiso/intern/CoMISoDefines.h
branches/soc-2010-rohith291991/intern/comiso/intern/ConstrainedSolver.cpp
branches/soc-2010-rohith291991/intern/comiso/intern/ConstrainedSolver.h
branches/soc-2010-rohith291991/intern/comiso/intern/MISolver.cpp
branches/soc-2010-rohith291991/intern/comiso/intern/MISolver.h
branches/soc-2010-rohith291991/intern/comiso/intern/StopWatch.h
branches/soc-2010-rohith291991/intern/comiso/intern/comiso.cpp
branches/soc-2010-rohith291991/intern/comiso/intern/common.cpp
branches/soc-2010-rohith291991/intern/comiso/intern/common.h
Modified: branches/soc-2010-rohith291991/intern/SConscript
===================================================================
--- branches/soc-2010-rohith291991/intern/SConscript 2010-06-08 10:30:14 UTC (rev 29334)
+++ branches/soc-2010-rohith291991/intern/SConscript 2010-06-08 10:31:12 UTC (rev 29335)
@@ -13,7 +13,8 @@
'itasc/SConscript',
'boolop/SConscript',
'opennl/SConscript',
- 'smoke/SConscript'])
+ 'smoke/SConscript',
+ 'comiso/SConscript'])
# NEW_CSG was intended for intern/csg, but
# getting it to compile is difficult
Added: branches/soc-2010-rohith291991/intern/comiso/CMakeLists.txt
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/CMakeLists.txt (rev 0)
+++ branches/soc-2010-rohith291991/intern/comiso/CMakeLists.txt 2010-06-08 10:31:12 UTC (rev 29335)
@@ -0,0 +1,150 @@
+cmake_minimum_required (VERSION 2.6)
+
+project(CoMISo)
+
+# add our macro directory to cmake search path
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+
+include (ACGCommon)
+
+acg_qt4 ()
+# change to 0 if QT should not be used
+set( WANT_COMISO_QT 1 )
+if( QT4_FOUND)
+ #message( WARNING " QT4 FOUND" )
+ if( WANT_COMISO_QT )
+ add_definitions (-DQT4_FOUND)
+ # message( WARNING " USING QT4" )
+ endif ()
+endif ()
+
+acg_get_version ()
+
+include (ACGOutput)
+
+find_package (GMM)
+if (NOT GMM_FOUND)
+ message (FATAL_ERROR "GMM not found!")
+endif ()
+
+find_package (Boost)
+if (NOT Boost_FOUND)
+ message (FATAL_ERROR "Boost not found!")
+endif ()
+
+find_package (BLAS)
+if (NOT BLAS_FOUND )
+ message (FATAL_ERROR "BLAS not found!")
+endif ()
+
+#added by CAT
+find_package (SUITESPARSE)
+if (NOT SUITESPARSE_FOUND )
+ message (FATAL_ERROR "SUITESPARSE not found!")
+endif ()
+
+if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/factored_solver/CMakeLists.txt" )
+ add_subdirectory (Examples/factored_solver)
+endif()
+
+if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/quadratic_solver/CMakeLists.txt" )
+ add_subdirectory (Examples/quadratic_solver)
+endif()
+if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/test2/CMakeLists.txt" )
+ add_subdirectory (Examples/test2)
+endif()
+if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/small_quadratic_example/CMakeLists.txt" )
+ add_subdirectory (Examples/small_quadratic_example)
+endif()
+if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/small_factored_example/CMakeLists.txt" )
+ add_subdirectory (Examples/small_factored_example)
+endif()
+
+
+
+include_directories (
+ ..
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${Boost_INCLUDE_DIR}
+ ${GMM_INCLUDE_DIR}
+ ${SUITESPARSE_INCLUDE_DIRS}
+)
+
+# generate dllexport macros on windows
+if (WIN32)
+ add_definitions(-DCOMISODLL)
+endif ()
+
+
+link_directories (
+ ${SUITESPARSE_LIBRARY_DIRS}
+)
+
+# source code directories
+set (directories
+ .
+ Solver
+ Config
+ Utils
+ QtWidgets
+)
+
+# generate dllexport macros on windows
+if (WIN32)
+ add_definitions(-DCOMISODLL)
+endif ()
+
+if (WIN32)
+ add_definitions(
+ -D_USE_MATH_DEFINES -DNOMINMAX
+ )
+endif ()
+
+# collect all header,source and ui files
+acg_append_files (headers "*.hh" ${directories})
+acg_append_files (sources "*.cc" ${directories})
+acg_append_files (ui "*.ui" ${directories})
+
+
+macro (of_list_filter _list)
+ if (WIN32)
+ foreach (_element ${${_list}})
+ if (_element MATCHES "gnuplot_i\\.(cc|hh)$")
+ list (REMOVE_ITEM ${_list} ${_element})
+ endif ()
+ endforeach ()
+ endif ()
+endmacro ()
+
+of_list_filter ( headers )
+of_list_filter ( sources )
+
+
+# remove template cc files from source file list
+acg_drop_templates (sources)
+
+if( QT4_FOUND)
+# genereate uic and moc targets
+acg_qt4_autouic (uic_targets ${ui})
+acg_qt4_automoc (moc_targets ${headers})
+endif()
+acg_add_library (CoMISo SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
+
+if (NOT APPLE)
+ target_link_libraries (CoMISo
+ ${QT_LIBRARIES}
+ ${SUITESPARSE_LIBRARIES}
+ ${BLAS_LIBRARIES}
+ )
+else(NOT APPLE)
+ target_link_libraries (CoMISo
+ ${QT_LIBRARIES}
+ ${SUITESPARSE_LIBRARIES}
+ ${BLAS_LIBRARIES}
+ )
+endif(NOT APPLE)
+
+# display results
+acg_print_configure_header (COMISO "CoMISo")
+
Added: branches/soc-2010-rohith291991/intern/comiso/COPYING
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/COPYING (rev 0)
+++ branches/soc-2010-rohith291991/intern/comiso/COPYING 2010-06-08 10:31:12 UTC (rev 29335)
@@ -0,0 +1,675 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list