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

Adjusted all plugins depending on skeleton type and fixed templates which where compiled

parent 84335eab
...@@ -35,11 +35,6 @@ endif () ...@@ -35,11 +35,6 @@ endif ()
# Cleanup # Cleanup
#======================================================= #=======================================================
# remove template cc files from source file list
acg_drop_templates (sources)
# collect all header,source files # collect all header,source files
acg_append_files (headers "*.hh" . ) acg_append_files (headers "*.hh" . )
acg_append_files (sources "*.cc" . ) acg_append_files (sources "*.cc" . )
...@@ -62,6 +57,8 @@ include_directories ( ...@@ -62,6 +57,8 @@ include_directories (
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
) )
# remove template cc files from source file list
acg_drop_templates (sources)
acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers} ${moc_targets}) acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers} ${moc_targets})
add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib) add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib)
......
...@@ -35,16 +35,12 @@ endif () ...@@ -35,16 +35,12 @@ endif ()
# Cleanup # Cleanup
#======================================================= #=======================================================
# remove template cc files from source file list
acg_drop_templates (sources)
# collect all header,source files # collect all header,source files
acg_append_files (headers "*.hh" . ) acg_append_files (headers "*.hh" . )
acg_append_files (sources "*.cc" . ) acg_append_files (sources "*.cc" . )
acg_qt5_automoc (moc_targets ${headers}) acg_qt5_automoc (moc_targets ${headers})
# Match our current directory name # Match our current directory name
string (REGEX MATCH "[^/\\]*$" TYPENAME ${CMAKE_CURRENT_SOURCE_DIR}) string (REGEX MATCH "[^/\\]*$" TYPENAME ${CMAKE_CURRENT_SOURCE_DIR})
string(TOUPPER ${TYPENAME} TYPENAME ) string(TOUPPER ${TYPENAME} TYPENAME )
...@@ -61,7 +57,9 @@ include_directories ( ...@@ -61,7 +57,9 @@ include_directories (
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
) )
acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers} ${moc_targets} ) # remove template cc files from source file list
acg_drop_templates (sources)
acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers} ${moc_targets})
add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib) add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib)
......
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