diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt index c2d386dc..0fe840db 100644 --- a/Doc/CMakeLists.txt +++ b/Doc/CMakeLists.txt @@ -6,7 +6,7 @@ IF (DOXYGEN_FOUND) vci_create_doc_target(doc-install) if (TARGET doc-install) - vci_copy_after_build (doc-install "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Doc/html" "${CMAKE_INSTALL_PREFIX}/${ACG_PROJECT_DATADIR}/doc/html") + vci_copy_after_build (doc-install "${CMAKE_BINARY_DIR}/Build/${VCI_PROJECT_DATADIR}/Doc/html" "${CMAKE_INSTALL_PREFIX}/${VCI_PROJECT_DATADIR}/doc/html") endif() ENDIF(DOXYGEN_FOUND) diff --git a/Doc/Tutorial/CMakeLists.txt b/Doc/Tutorial/CMakeLists.txt index e4b64da9..0567214f 100644 --- a/Doc/Tutorial/CMakeLists.txt +++ b/Doc/Tutorial/CMakeLists.txt @@ -8,8 +8,8 @@ include_directories ( set (targetName MyOwnProject) # collect all header and source files -acg_append_files (headers "*.hh" .) -acg_append_files (sources "*.cc" .) +vci_append_files (headers "*.hh" .) +vci_append_files (sources "*.cc" .) vci_add_executable (${targetName} ${headers} ${sources}) diff --git a/Doc/doxy.config.in b/Doc/doxy.config.in index ccfecd2c..1e35d561 100644 --- a/Doc/doxy.config.in +++ b/Doc/doxy.config.in @@ -58,7 +58,7 @@ PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/images/rwth_vci_rgb.jpg # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/Build/@ACG_PROJECT_DATADIR@/Doc +OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/Build/@VCI_PROJECT_DATADIR@/Doc # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -1128,7 +1128,7 @@ HTML_HEADER = # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_footer.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/html/vci_footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of diff --git a/Doc/html/acg_footer.html b/Doc/html/vci_footer.html similarity index 100% rename from Doc/html/acg_footer.html rename to Doc/html/vci_footer.html diff --git a/Doc/images/src/mesh.collapse.tex b/Doc/images/src/mesh.collapse.tex index 12fc437c..63310a5e 100644 --- a/Doc/images/src/mesh.collapse.tex +++ b/Doc/images/src/mesh.collapse.tex @@ -5,13 +5,13 @@ \usepackage{tikz} \usepackage{color} -\definecolor{ACG}{RGB}{55,91,64} +\definecolor{VCI}{RGB}{55,91,64} \begin{document} \begin{center} -%\colorbox{ACG}{ +%\colorbox{VCI}{ \begin{tikzpicture} [ diff --git a/Doc/images/src/mesh.flip.tex b/Doc/images/src/mesh.flip.tex index 8bf5e9c1..c6118971 100644 --- a/Doc/images/src/mesh.flip.tex +++ b/Doc/images/src/mesh.flip.tex @@ -5,13 +5,13 @@ \usepackage{tikz} \usepackage{color} -\definecolor{ACG}{RGB}{55,91,64} +\definecolor{VCI}{RGB}{55,91,64} \begin{document} \begin{center} -%\colorbox{ACG}{ +%\colorbox{VCI}{ \begin{tikzpicture} [ diff --git a/cmake/OpenMeshPackage.cmake b/cmake/OpenMeshPackage.cmake index 6892b43b..39b36b21 100644 --- a/cmake/OpenMeshPackage.cmake +++ b/cmake/OpenMeshPackage.cmake @@ -7,7 +7,7 @@ option ( # set name set (CPACK_PACKAGE_NAME "OpenMesh") -set (CPACK_PACKAGE_VENDOR "ACG") +set (CPACK_PACKAGE_VENDOR "VCI") # set version set (CPACK_PACKAGE_VERSION_MAJOR "${OPENMESH_VERSION_MAJOR}") @@ -47,9 +47,6 @@ list (APPEND CPACK_SOURCE_IGNORE_FILES "/tmp/") list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevelop") list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevses") -list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/lib/") -list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/include/") - if (DISABLE_QMAKE_BUILD) list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.pro") list (APPEND CPACK_SOURCE_IGNORE_FILES "/qmake/") @@ -123,7 +120,7 @@ endif () if (WIN32) set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP "true") # include (InstallRequiredSystemLibraries) - install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${ACG_PROJECT_BINDIR}) + install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${VCI_PROJECT_BINDIR}) else () include (InstallRequiredSystemLibraries) endif () diff --git a/src/Unittests/CMakeLists.txt b/src/Unittests/CMakeLists.txt index c21a0080..09b15e13 100644 --- a/src/Unittests/CMakeLists.txt +++ b/src/Unittests/CMakeLists.txt @@ -120,9 +120,9 @@ if ( OPENMESH_BUILD_UNIT_TESTS ) endforeach(TAR) endif() - acg_copy_after_build(unittests ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) - acg_copy_after_build(unittests_customvec ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) - acg_copy_after_build(unittests_doublevec ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) + vci_copy_after_build(unittests ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) + vci_copy_after_build(unittests_customvec ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) + vci_copy_after_build(unittests_doublevec ${CMAKE_CURRENT_SOURCE_DIR}/TestFiles ${CMAKE_BINARY_DIR}/Unittests/) add_test(NAME AllTestsIn_OpenMesh_tests WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/Unittests" COMMAND "${CMAKE_BINARY_DIR}/Unittests/unittests") add_test(NAME AllTestsIn_OpenMesh_tests_with_minimal_vector WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/Unittests" COMMAND "${CMAKE_BINARY_DIR}/Unittests/unittests_customvec")