Commit 7f86199b authored by Henrik Zimmer's avatar Henrik Zimmer

fixed some cmake stuff

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@11 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent 2068642d
......@@ -106,7 +106,6 @@ acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
message( WARNING ${ui})
macro (of_list_filter _list)
if (WIN32)
......@@ -130,7 +129,6 @@ if( QT4_FOUND)
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
endif()
message( WARNING ${uic_targets})
acg_add_library (CoMISo SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
if (NOT APPLE)
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#ifndef COMISODLLEXPORT
#ifdef WIN32
#ifdef COMISOMDLL
......
include (ACGCommon)
find_package(CoMISo)
include_directories (
..
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR}
)
link_directories (
# ${CMAKE_CURRENT_BINARY_DIR}/Build/lib/CoMISo
#/data/home1/zimmer/projects/ConstrainedSolver/package/CoMISo/build/Build/lib/CoMISo
)
# source code directories
......
#include <Utils/StopWatch.hh>
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#include <CoMISo/Utils/StopWatch.hh>
#include <gmm/gmm.h>
#include <vector>
#include <Solver/ConstrainedSolver.hh>
#include <Solver/MISolver.hh>
#include <Solver/GMM_Tools.hh>
#include <CoMISo/Solver/ConstrainedSolver.hh>
#include <CoMISo/Solver/MISolver.hh>
#include <CoMISo/Solver/GMM_Tools.hh>
/// function to setup a random sparse row matrix of dimension _m x _n
/// for the simplicity of this example only integer valued entries are used
......
include (ACGCommon)
find_package(CoMISo)
include_directories (
..
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR}
)
link_directories (
......
#include <Utils/StopWatch.hh>
#include <CoMISo/Utils/StopWatch.hh>
#include <gmm/gmm.h>
#include <vector>
#include <Solver/ConstrainedSolver.hh>
#include <Solver/MISolver.hh>
#include <Solver/GMM_Tools.hh>
#include <CoMISo/Solver/ConstrainedSolver.hh>
#include <CoMISo/Solver/MISolver.hh>
#include <CoMISo/Solver/GMM_Tools.hh>
/// function to setup a random sparse row matrix of dimension _m x _n
/// for the simplicity of this example only integer valued entries are used
......
include (ACGCommon)
find_package(CoMISo)
include_directories (
..
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR}
)
link_directories (
# ${CMAKE_CURRENT_BINARY_DIR}/Build/lib/CoMISo
#/data/home1/zimmer/projects/ConstrainedSolver/package/CoMISo/build/Build/lib/CoMISo
)
# source code directories
......
......@@ -5,30 +5,7 @@
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This example is part of CoMISo. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper 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 Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
......@@ -42,12 +19,12 @@
#include <Utils/StopWatch.hh>
#include <CoMISo/Utils/StopWatch.hh>
#include <gmm/gmm.h>
#include <vector>
#include <Solver/ConstrainedSolver.hh>
#include <Solver/MISolver.hh>
#include <Solver/GMM_Tools.hh>
#include <CoMISo/Solver/ConstrainedSolver.hh>
#include <CoMISo/Solver/MISolver.hh>
#include <CoMISo/Solver/GMM_Tools.hh>
/// function to initialize a simple row matrix of equations
......
include (ACGCommon)
find_package(CoMISo)
include_directories (
..
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR}
)
link_directories (
# ${CMAKE_CURRENT_BINARY_DIR}/Build/lib/CoMISo
#/data/home1/zimmer/projects/ConstrainedSolver/package/CoMISo/build/Build/lib/CoMISo
)
# source code directories
......
......@@ -5,30 +5,7 @@
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This example is part of CoMISo. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper 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 Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
......@@ -40,14 +17,12 @@
* *
\*===========================================================================*/
#include <Utils/StopWatch.hh>
#include <CoMISo/Utils/StopWatch.hh>
#include <gmm/gmm.h>
#include <vector>
#include <Solver/ConstrainedSolver.hh>
#include <Solver/MISolver.hh>
#include <Solver/GMM_Tools.hh>
#include <CoMISo/Solver/ConstrainedSolver.hh>
#include <CoMISo/Solver/MISolver.hh>
#include <CoMISo/Solver/GMM_Tools.hh>
/// function to initialize a simple system of linear equations
......
include (ACGCommon)
find_package(CoMISo)
include_directories (
..
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR}
)
link_directories (
......
#include <Utils/StopWatch.hh>
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#include <CoMISo/Utils/StopWatch.hh>
#include <gmm/gmm.h>
#include <vector>
#include <Solver/ConstrainedSolver.hh>
#include <Solver/MISolver.hh>
#include <Solver/GMM_Tools.hh>
#include <CoMISo/Solver/ConstrainedSolver.hh>
#include <CoMISo/Solver/MISolver.hh>
#include <CoMISo/Solver/GMM_Tools.hh>
#define N 20
#define M 24
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS MISolverDialog - IMPLEMENTATION
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS MiSolverDialog
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#include "cholmod.h"
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS CholmodSolver
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#define ACG_CHOLMOD_SOLVER_TEMPLATES_C
#include "CholmodSolver.hh"
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#include "ConstrainedSolver.hh"
#include <gmm/gmm.h>
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS ConstrainedSolver
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS MISolver - IMPLEMENTATION
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS GMM_Tools - IMPLEMENTATION
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#include "MISolver.hh"
#ifdef QT4_FOUND
#include <QtWidgets/MISolverDialog.hh>
#include <CoMISo/QtWidgets/MISolverDialog.hh>
#endif
#include <gmm/gmm.h>
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS MISolver
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS MISolver - IMPLEMENTATION
......
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS ColorCoder
......
//=============================================================================
//
// CLASS GeometryToolsT
//
//
// Author: Henrik Zimmer <henrik@zimmer.to>
//
// Version: $Revision: 1$
// Date: $Date: XX-XX-200X$
//
//=============================================================================
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.graphics.rwth-aachen.de *
* *
*---------------------------------------------------------------------------*
* This file is a part of CoMISo. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 1 $ *
* $Author: zimmer $ *
* $Date: 2009-08-05 16:35:37 +0200 (Wed, 05 Aug 2009) $ *
* *
\*===========================================================================*/
#ifndef VSTOOLS_HH
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment