Commit faa1a791 authored by Jan Möbius's avatar Jan Möbius

Get rid of the T.cc naming for template implementations

parent 446d8cf1
Pipeline #8713 passed with stage
in 48 minutes and 56 seconds
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<b>Breaking changes:</b> <b>Breaking changes:</b>
<ul> <ul>
<li>Don't run and test on VS2013 anymore. As VS2013 still lacks some C++11 features, we remove it from our list of supported platforms</li> <li>Don't run and test on VS2013 anymore. As VS2013 still lacks some C++11 features, we remove it from our list of supported platforms</li>
<li>(Only internally breaking change:)Get rid of the T.cc naming for template implementations. New names end with T_impl.hh. This avoids all the missing files in the IDE GUIs due to the filtered T.cc files. Also the install targets could be simplified due to this change. For OpenMesh users, this change should be transparent.</li>
</ul> </ul>
<b>Core</b> <b>Core</b>
......
...@@ -7,6 +7,7 @@ The following naming conventions are used for the %OpenMesh code: ...@@ -7,6 +7,7 @@ The following naming conventions are used for the %OpenMesh code:
<b>Files:</b> <b>Files:</b>
\li \c MyClass.cc for C++-Implementation of class \c MyClass \li \c MyClass.cc for C++-Implementation of class \c MyClass
\li \c MyClassT_impl.hh for Header only C++-Implementation of template class \c MyClass
\li \c MyClass.hh for C++-Header of class \c MyClass \li \c MyClass.hh for C++-Header of class \c MyClass
<b>Classes:</b> <b>Classes:</b>
......
...@@ -158,15 +158,6 @@ macro (acg_append_files ret ext) ...@@ -158,15 +158,6 @@ macro (acg_append_files ret ext)
endforeach () endforeach ()
endmacro () endmacro ()
# drop all "*T.cc" files from list
macro (acg_drop_templates list)
foreach (_file ${${list}})
if (_file MATCHES "T.cc$")
list (REMOVE_ITEM ${list} ${_file})
endif ()
endforeach ()
endmacro ()
# get all files in directory, but ignore svn # get all files in directory, but ignore svn
macro (acg_get_files_in_dir ret dir) macro (acg_get_files_in_dir ret dir)
file (GLOB_RECURSE __files RELATIVE "${dir}" "${dir}/*") file (GLOB_RECURSE __files RELATIVE "${dir}" "${dir}/*")
......
...@@ -13,17 +13,15 @@ set (directories ...@@ -13,17 +13,15 @@ set (directories
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" ${directories}) acg_append_files (headers "*.hh" ${directories})
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
set (sources set (sources
../../QtViewer/QGLViewerWidget.cc ../../QtViewer/QGLViewerWidget.cc
../../QtViewer/MeshViewerWidgetT.cc
../DecimaterViewerWidget.cc ../DecimaterViewerWidget.cc
../decimaterviewer.cc ../decimaterviewer.cc
) )
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32) if (WIN32)
acg_add_executable (DecimaterGui WIN32 ${sources} ${headers}) acg_add_executable (DecimaterGui WIN32 ${sources} ${headers})
else () else ()
......
...@@ -11,13 +11,10 @@ acg_append_files (headers "*.hh" .) ...@@ -11,13 +11,10 @@ acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) acg_append_files (sources "*.cc" .)
list (APPEND sources "../QtViewer/QGLViewerWidget.cc") list (APPEND sources "../QtViewer/QGLViewerWidget.cc")
list (APPEND sources "../QtViewer/MeshViewerWidgetT.cc")
list (APPEND headers "../QtViewer/QGLViewerWidget.hh") list (APPEND headers "../QtViewer/QGLViewerWidget.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh") list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT_impl.hh")
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32) if (WIN32)
acg_add_executable( ProgViewer WIN32 ${sources} ${headers}) acg_add_executable( ProgViewer WIN32 ${sources} ${headers})
......
...@@ -14,9 +14,6 @@ set (directories ...@@ -14,9 +14,6 @@ set (directories
acg_append_files (headers "*.hh" ${directories}) acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories}) acg_append_files (sources "*.cc" ${directories})
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32) if (WIN32)
acg_add_executable (QtViewer WIN32 ${sources} ${headers}) acg_add_executable (QtViewer WIN32 ${sources} ${headers})
else () else ()
......
...@@ -192,7 +192,7 @@ protected: ...@@ -192,7 +192,7 @@ protected:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC)
# define OPENMESH_MESHVIEWERWIDGET_TEMPLATES # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES
# include "MeshViewerWidgetT.cc" # include "MeshViewerWidgetT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
...@@ -14,16 +14,15 @@ set (directories ...@@ -14,16 +14,15 @@ set (directories
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" ${directories}) acg_append_files (headers "*.hh" ${directories})
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
set (sources set (sources
../../QtViewer/QGLViewerWidget.cc ../../QtViewer/QGLViewerWidget.cc
../../QtViewer/MeshViewerWidgetT.cc
../SubdivideWidget.cc ../SubdivideWidget.cc
../qtsubdivider.cc ../qtsubdivider.cc
) )
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32) if (WIN32)
acg_add_executable (SubdividerGui WIN32 ${sources} ${headers}) acg_add_executable (SubdividerGui WIN32 ${sources} ${headers})
else () else ()
......
...@@ -123,7 +123,7 @@ private: ...@@ -123,7 +123,7 @@ private:
//============================================================================= //=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(OPENMESH_SOOPENMESHNODE_CC) #if defined(INCLUDE_TEMPLATES) && !defined(OPENMESH_SOOPENMESHNODE_CC)
# define OPENMESH_SOOPENMESHMODE_TEMPLATES # define OPENMESH_SOOPENMESHMODE_TEMPLATES
# include "SoOpenMeshNodeT.cc" # include "SoOpenMeshNodeT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_SOOPENMESHNODE_HH #endif // OPENMESH_SOOPENMESHNODE_HH
......
...@@ -168,7 +168,7 @@ protected: ...@@ -168,7 +168,7 @@ protected:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC)
# define OPENMESH_MESHVIEWERWIDGET_TEMPLATES # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES
# include "MeshViewerWidgetT.cc" # include "MeshViewerWidgetT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined #endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined
......
...@@ -168,7 +168,7 @@ protected: ...@@ -168,7 +168,7 @@ protected:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC)
# define OPENMESH_MESHVIEWERWIDGET_TEMPLATES # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES
# include "MeshViewerWidgetT.cc" # include "MeshViewerWidgetT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined #endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined
......
...@@ -10,13 +10,10 @@ acg_append_files (headers "*.hh" .) ...@@ -10,13 +10,10 @@ acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) acg_append_files (sources "*.cc" .)
list (APPEND sources "../../QtViewer/QGLViewerWidget.cc") list (APPEND sources "../../QtViewer/QGLViewerWidget.cc")
list (APPEND sources "../../QtViewer/MeshViewerWidgetT.cc")
list (APPEND headers "../../QtViewer/QGLViewerWidget.hh") list (APPEND headers "../../QtViewer/QGLViewerWidget.hh")
list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh") list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh")
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32) if (WIN32)
acg_add_executable (Synthesizer WIN32 ${sources} ${headers}) acg_add_executable (Synthesizer WIN32 ${sources} ${headers})
......
...@@ -24,10 +24,6 @@ set (directories ...@@ -24,10 +24,6 @@ set (directories
acg_append_files (headers "*.hh" ${directories}) acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories}) acg_append_files (sources "*.cc" ${directories})
#Drop the template only cc files
acg_drop_templates(sources)
# Disable Library installation when not building OpenMesh on its own but as part of another project! # Disable Library installation when not building OpenMesh on its own but as part of another project!
if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh") if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
set(ACG_NO_LIBRARY_INSTALL true) set(ACG_NO_LIBRARY_INSTALL true)
...@@ -81,16 +77,16 @@ endif() ...@@ -81,16 +77,16 @@ endif()
# Install Header Files (Apple) # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*T.cc" ) FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" )
FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" ) FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" )
FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*T.cc" ) FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" )
FILE(GLOB files_install_IO_exporter "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*T.cc" ) FILE(GLOB files_install_IO_exporter "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*.hh" )
FILE(GLOB files_install_IO_reader "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*T.cc" ) FILE(GLOB files_install_IO_reader "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*.hh" )
FILE(GLOB files_install_IO_writer "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*T.cc" ) FILE(GLOB files_install_IO_writer "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*.hh" )
FILE(GLOB files_install_Mesh "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*T.cc" ) FILE(GLOB files_install_Mesh "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*.hh" )
FILE(GLOB files_install_Mesh_Gen "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*T.cc" ) FILE(GLOB files_install_Mesh_Gen "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*.hh" )
FILE(GLOB files_install_System "${CMAKE_CURRENT_SOURCE_DIR}/System/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/System/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/System/config.h" ) FILE(GLOB files_install_System "${CMAKE_CURRENT_SOURCE_DIR}/System/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/System/config.h" )
FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*T.cc" ) FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" )
INSTALL(FILES ${files_install_Geometry} DESTINATION include/OpenMesh/Core/Geometry ) INSTALL(FILES ${files_install_Geometry} DESTINATION include/OpenMesh/Core/Geometry )
INSTALL(FILES ${files_install_IO} DESTINATION include/OpenMesh/Core/IO ) INSTALL(FILES ${files_install_IO} DESTINATION include/OpenMesh/Core/IO )
INSTALL(FILES ${files_install_IO_importer} DESTINATION include/OpenMesh/Core/IO/importer ) INSTALL(FILES ${files_install_IO_importer} DESTINATION include/OpenMesh/Core/IO/importer )
...@@ -118,17 +114,6 @@ install(DIRECTORY . ...@@ -118,17 +114,6 @@ install(DIRECTORY .
PATTERN "Templates" EXCLUDE PATTERN "Templates" EXCLUDE
PATTERN "Debian*" EXCLUDE) PATTERN "Debian*" EXCLUDE)
#install Template cc files (required by headers)
install(DIRECTORY .
DESTINATION include/OpenMesh/Core
FILES_MATCHING
PATTERN "*T.cc"
PATTERN "CVS" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "tmp" EXCLUDE
PATTERN "Templates" EXCLUDE
PATTERN "Debian*" EXCLUDE)
#install the config file #install the config file
install(FILES System/config.h DESTINATION include/OpenMesh/Core/System) install(FILES System/config.h DESTINATION include/OpenMesh/Core/System)
...@@ -138,14 +123,13 @@ install(DIRECTORY IO/ ...@@ -138,14 +123,13 @@ install(DIRECTORY IO/
FILES_MATCHING FILES_MATCHING
PATTERN "*.inl" PATTERN "*.inl"
PATTERN "CVS" EXCLUDE PATTERN "CVS" EXCLUDE
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "reader" EXCLUDE PATTERN "reader" EXCLUDE
PATTERN "writer" EXCLUDE PATTERN "writer" EXCLUDE
PATTERN "importer" EXCLUDE PATTERN "importer" EXCLUDE
PATTERN "exporter" EXCLUDE PATTERN "exporter" EXCLUDE
PATTERN "tmp" EXCLUDE PATTERN "tmp" EXCLUDE
PATTERN "Debian*" EXCLUDE ) PATTERN "Debian*" EXCLUDE )
endif () endif ()
...@@ -119,7 +119,7 @@ private: ...@@ -119,7 +119,7 @@ private:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_NORMALCONE_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_NORMALCONE_C)
#define OPENMESH_NORMALCONE_TEMPLATES #define OPENMESH_NORMALCONE_TEMPLATES
#include "NormalConeT.cc" #include "NormalConeT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_NORMALCONE_HH defined #endif // OPENMESH_NORMALCONE_HH defined
......
...@@ -741,7 +741,7 @@ namespace OMFormat { ...@@ -741,7 +741,7 @@ namespace OMFormat {
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_IO_OMFORMAT_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_IO_OMFORMAT_CC)
# define OPENMESH_IO_OMFORMAT_TEMPLATES # define OPENMESH_IO_OMFORMAT_TEMPLATES
# include "OMFormatT.cc" # include "OMFormatT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif #endif
......
...@@ -903,7 +903,7 @@ private: ...@@ -903,7 +903,7 @@ private:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_ARRAY_KERNEL_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_ARRAY_KERNEL_C)
# define OPENMESH_ARRAY_KERNEL_TEMPLATES # define OPENMESH_ARRAY_KERNEL_TEMPLATES
# include "ArrayKernelT.cc" # include "ArrayKernelT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_ARRAY_KERNEL_HH defined #endif // OPENMESH_ARRAY_KERNEL_HH defined
......
...@@ -628,7 +628,7 @@ const LHS mesh_cast(const PolyMeshT<KERNEL> *rhs) { ...@@ -628,7 +628,7 @@ const LHS mesh_cast(const PolyMeshT<KERNEL> *rhs) {
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_POLYMESH_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_POLYMESH_C)
# define OPENMESH_POLYMESH_TEMPLATES # define OPENMESH_POLYMESH_TEMPLATES
# include "PolyMeshT.cc" # include "PolyMeshT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_POLYMESHT_HH defined #endif // OPENMESH_POLYMESHT_HH defined
......
...@@ -428,7 +428,7 @@ public: ...@@ -428,7 +428,7 @@ public:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_TRIMESH_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_TRIMESH_C)
#define OPENMESH_TRIMESH_TEMPLATES #define OPENMESH_TRIMESH_TEMPLATES
#include "TriMeshT.cc" #include "TriMeshT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_TRIMESH_HH defined #endif // OPENMESH_TRIMESH_HH defined
......
...@@ -142,7 +142,7 @@ private: ...@@ -142,7 +142,7 @@ private:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SINGLETON_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SINGLETON_C)
# define OPENMESH_SINGLETON_TEMPLATES # define OPENMESH_SINGLETON_TEMPLATES
# include "SingletonT.cc" # include "SingletonT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // __SINGLETON_HH__ #endif // __SINGLETON_HH__
......
...@@ -22,9 +22,6 @@ set (directories ...@@ -22,9 +22,6 @@ set (directories
acg_append_files (headers "*.hh" ${directories}) acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories}) acg_append_files (sources "*.cc" ${directories})
#Drop the template only cc files
acg_drop_templates(sources)
IF(WIN32 AND NOT MINGW) IF(WIN32 AND NOT MINGW)
acg_append_files (sources "*.c" ${directories}) acg_append_files (sources "*.c" ${directories})
ENDIF(WIN32 AND NOT MINGW) ENDIF(WIN32 AND NOT MINGW)
...@@ -78,15 +75,15 @@ endif() ...@@ -78,15 +75,15 @@ endif()
# Install Header Files (Apple) # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*T.cc" ) FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" )
FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*T.cc" ) FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" )
FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*T.cc" ) FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" )
FILE(GLOB files_install_Smoother "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*T.cc" ) FILE(GLOB files_install_Smoother "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*.hh" )
FILE(GLOB files_install_Subdivider_Adaptive "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*T.cc" ) FILE(GLOB files_install_Subdivider_Adaptive "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*.hh" )
FILE(GLOB files_install_Subdivider_Uniform "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*T.cc" ) FILE(GLOB files_install_Subdivider_Uniform "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*.hh" )
FILE(GLOB files_install_Subdivider_Uniform_Composite "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*T.cc" ) FILE(GLOB files_install_Subdivider_Uniform_Composite "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*.hh" )
FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/getopt.h" ) FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/getopt.h" )
FILE(GLOB files_install_VDPM "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*T.cc" ) FILE(GLOB files_install_VDPM "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*.hh" )
INSTALL(FILES ${files_install_Decimater} DESTINATION include/OpenMesh/Tools/Decimater ) INSTALL(FILES ${files_install_Decimater} DESTINATION include/OpenMesh/Tools/Decimater )
INSTALL(FILES ${files_install_Dualizer} DESTINATION include/OpenMesh/Tools/Dualizer ) INSTALL(FILES ${files_install_Dualizer} DESTINATION include/OpenMesh/Tools/Dualizer )
INSTALL(FILES ${files_install_KERNEL_OSG} DESTINATION include/OpenMesh/Tools/Kernel_OSG ) INSTALL(FILES ${files_install_KERNEL_OSG} DESTINATION include/OpenMesh/Tools/Kernel_OSG )
...@@ -113,17 +110,6 @@ install(DIRECTORY . ...@@ -113,17 +110,6 @@ install(DIRECTORY .
PATTERN "Templates" EXCLUDE PATTERN "Templates" EXCLUDE
PATTERN "Debian*" EXCLUDE) PATTERN "Debian*" EXCLUDE)
#install Template cc files (required by headers)
install(DIRECTORY .
DESTINATION include/OpenMesh/Tools
FILES_MATCHING
PATTERN "*T.cc"
PATTERN "CVS" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "tmp" EXCLUDE
PATTERN "Templates" EXCLUDE
PATTERN "Debian*" EXCLUDE)
#install the config file #install the config file
install(FILES Utils/getopt.h DESTINATION include/OpenMesh/Tools/Utils) install(FILES Utils/getopt.h DESTINATION include/OpenMesh/Tools/Utils)
......
...@@ -277,7 +277,7 @@ private: //------------------------------------------------------- private data ...@@ -277,7 +277,7 @@ private: //------------------------------------------------------- private data
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_BASE_DECIMATER_DECIMATERT_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_BASE_DECIMATER_DECIMATERT_CC)
#define OPENMESH_BASE_DECIMATER_TEMPLATES #define OPENMESH_BASE_DECIMATER_TEMPLATES
#include "BaseDecimaterT.cc" #include "BaseDecimaterT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_BASE_DECIMATER_DECIMATERT_HH defined #endif // OPENMESH_BASE_DECIMATER_DECIMATERT_HH defined
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* * * *
* ========================================================================= */ * ========================================================================= */
/** \file DecimaterT.cc /** \file DecimaterT_impl.cc
*/ */
//============================================================================= //=============================================================================
......
...@@ -209,7 +209,7 @@ private: //------------------------------------------------------- private data ...@@ -209,7 +209,7 @@ private: //------------------------------------------------------- private data
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_DECIMATERT_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_DECIMATERT_CC)
#define OPENMESH_DECIMATER_TEMPLATES #define OPENMESH_DECIMATER_TEMPLATES
#include "DecimaterT.cc" #include "DecimaterT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_DECIMATER_DECIMATERT_HH defined #endif // OPENMESH_DECIMATER_DECIMATERT_HH defined
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file DecimaterT.cc /** \file DecimaterT_impl.hh
*/ */
//============================================================================= //=============================================================================
......
...@@ -138,7 +138,7 @@ private: //------------------------------------------------------- private data ...@@ -138,7 +138,7 @@ private: //------------------------------------------------------- private data
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MULTIPLE_CHOICE_DECIMATER_DECIMATERT_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MULTIPLE_CHOICE_DECIMATER_DECIMATERT_CC)
#define OPENMESH_MULTIPLE_CHOICE_DECIMATER_TEMPLATES #define OPENMESH_MULTIPLE_CHOICE_DECIMATER_TEMPLATES
#include "McDecimaterT.cc" #include "McDecimaterT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_MC_DECIMATER_DECIMATERT_HH defined #endif // OPENMESH_MC_DECIMATER_DECIMATERT_HH defined
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file McDecimaterT.cc /** \file McDecimaterT_impl.hh
*/ */
//============================================================================= //=============================================================================
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file MixedDecimaterT.cc /** \file MixedDecimaterT.hh
*/ */
//============================================================================= //=============================================================================
...@@ -123,7 +123,7 @@ private: //------------------------------------------------------- private data ...@@ -123,7 +123,7 @@ private: //------------------------------------------------------- private data
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MIXED_DECIMATER_DECIMATERT_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MIXED_DECIMATER_DECIMATERT_CC)
#define OPENMESH_MIXED_DECIMATER_TEMPLATES #define OPENMESH_MIXED_DECIMATER_TEMPLATES
#include "MixedDecimaterT.cc" #include "MixedDecimaterT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_MIXED_DECIMATER_DECIMATERT_HH #endif // OPENMESH_MIXED_DECIMATER_DECIMATERT_HH
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file MixedDecimaterT.cc /** \file MixedDecimaterT_impl.hh
*/ */
//============================================================================= //=============================================================================
......
...@@ -142,7 +142,7 @@ class ModAspectRatioT: public ModBaseT<MeshT> { ...@@ -142,7 +142,7 @@ class ModAspectRatioT: public ModBaseT<MeshT> {
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODASPECTRATIOT_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODASPECTRATIOT_C)
#define OPENMESH_DECIMATER_MODASPECTRATIOT_TEMPLATES #define OPENMESH_DECIMATER_MODASPECTRATIOT_TEMPLATES
#include "ModAspectRatioT.cc" #include "ModAspectRatioT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_DECIMATER_MODASPECTRATIOT_HH defined #endif // OPENMESH_DECIMATER_MODASPECTRATIOT_HH defined
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file ModAspectRatioT.cc /** \file ModAspectRatioT_impl.hh
*/ */
//============================================================================= //=============================================================================
......
...@@ -115,7 +115,7 @@ class ModEdgeLengthT: public ModBaseT<MeshT> { ...@@ -115,7 +115,7 @@ class ModEdgeLengthT: public ModBaseT<MeshT> {
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODEDGELENGTHT_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODEDGELENGTHT_C)
#define MODEDGELENGTHT_TEMPLATES #define MODEDGELENGTHT_TEMPLATES
#include "ModEdgeLengthT.cc" #include "ModEdgeLengthT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_DECIMATER_MODEDGELENGTHT_HH defined #endif // OPENMESH_DECIMATER_MODEDGELENGTHT_HH defined
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file ModEdgeLengthT.cc /** \file ModEdgeLengthT_impl.hh
*/ */
//============================================================================= //=============================================================================
......
...@@ -153,7 +153,7 @@ class ModHausdorffT: public ModBaseT<MeshT> { ...@@ -153,7 +153,7 @@ class ModHausdorffT: public ModBaseT<MeshT> {
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODHAUSDORFFT_C) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODHAUSDORFFT_C)
#define OPENMESH_DECIMATER_MODHAUSDORFFT_TEMPLATES #define OPENMESH_DECIMATER_MODHAUSDORFFT_TEMPLATES
#include "ModHausdorffT.cc" #include "ModHausdorffT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_DECIMATER_MODHAUSDORFFT_HH defined #endif // OPENMESH_DECIMATER_MODHAUSDORFFT_HH defined
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* ========================================================================= */ * ========================================================================= */
/** \file ModHausdorffT.cc /** \file ModHausdorffT_impl.hh
*/ */
......
...@@ -185,7 +185,7 @@ private: ...@@ -185,7 +185,7 @@ private:
//============================================================================= //=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODPROGMESH_CC) #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODPROGMESH_CC)
#define OSG_MODPROGMESH_TEMPLATES #define OSG_MODPROGMESH_TEMPLATES
#include "ModProgMeshT.cc" #include "ModProgMeshT_impl.hh"
#endif #endif
//============================================================================= //=============================================================================
#endif // OPENMESH_TOOLS_PROGMESHT_HH defined #endif // OPENMESH_TOOLS_PROGMESHT_HH defined
......