Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming of functions and variables in cmake-library

Browse Source
This commit is contained in:
Max Lyon
2020-12-07 13:18:53 +01:00
parent d0e517ebe4
commit 50363592be
21 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -41,9 +41,9 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_CU
set (CMAKE_DEBUG_POSTFIX "d") set (CMAKE_DEBUG_POSTFIX "d")
# include our cmake files # include our cmake files
include (ACGCommon) include (VCICommon)
acg_get_version () vci_get_version ()
# Disable package building when built as an external library # Disable package building when built as an external library
@@ -51,8 +51,8 @@ if(${PROJECT_NAME} MATCHES "OpenMesh")
include(OpenMeshPackage) include(OpenMeshPackage)
endif() endif()
include (ACGOutput) include (VCIOutput)
include(ACGQt) include(VCIQt)
# ======================================================================== # ========================================================================
# Definitions # Definitions
@@ -203,4 +203,4 @@ install(EXPORT OpenMeshConfig DESTINATION share/OpenMesh/cmake)
export(TARGETS OpenMeshCore OpenMeshTools FILE OpenMeshConfig.cmake) export(TARGETS OpenMeshCore OpenMeshTools FILE OpenMeshConfig.cmake)
# display results # display results
acg_print_configure_header (OPENMESH "OpenMesh") vci_print_configure_header (OPENMESH "OpenMesh")

6
Doc/CMakeLists.txt
View File

@@ -1,12 +1,12 @@
include (ACGDoxygen) include (VCIDoxygen)
IF (DOXYGEN_FOUND) IF (DOXYGEN_FOUND)
# Add a documentation install target # Add a documentation install target
acg_create_doc_target(doc-install) vci_create_doc_target(doc-install)
if (TARGET doc-install) if (TARGET doc-install)
acg_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/${ACG_PROJECT_DATADIR}/Doc/html" "${CMAKE_INSTALL_PREFIX}/${ACG_PROJECT_DATADIR}/doc/html")
endif() endif()
ENDIF(DOXYGEN_FOUND) ENDIF(DOXYGEN_FOUND)

4
Doc/Tutorial/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
@@ -11,7 +11,7 @@ set (targetName MyOwnProject)
acg_append_files (headers "*.hh" .) acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) acg_append_files (sources "*.cc" .)
acg_add_executable (${targetName} ${headers} ${sources}) vci_add_executable (${targetName} ${headers} ${sources})
target_link_libraries (${targetName} target_link_libraries (${targetName}
OpenMeshCore OpenMeshCore

2
cmake-library

Submodule cmake-library updated: 408906cf7d...a493852332

4
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
if ( NOT DEFINED BUILD_APPS ) if ( NOT DEFINED BUILD_APPS )
set( BUILD_APPS true CACHE BOOL "Enable or disable building of apps" ) set( BUILD_APPS true CACHE BOOL "Enable or disable building of apps" )
@@ -48,7 +48,7 @@ if ( BUILD_APPS )
Qt5OpenGL Qt5OpenGL
Qt5Gui Qt5Gui
) )
acg_qt5 () vci_qt5 ()
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
endif() endif()

6
src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
@@ -21,9 +21,9 @@ set (sources
) )
if (WIN32) if (WIN32)
acg_add_executable (DecimaterGui WIN32 ${sources} ${headers}) vci_add_executable (DecimaterGui WIN32 ${sources} ${headers})
else () else ()
acg_add_executable (DecimaterGui ${sources} ${headers} ) vci_add_executable (DecimaterGui ${sources} ${headers} )
endif () endif ()
target_link_libraries (DecimaterGui target_link_libraries (DecimaterGui

4
src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (commandlineDecimater ../decimater.cc) vci_add_executable (commandlineDecimater ../decimater.cc)
target_link_libraries (commandlineDecimater target_link_libraries (commandlineDecimater
OpenMeshCore OpenMeshCore

4
src/OpenMesh/Apps/Dualizer/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
) )
acg_add_executable (Dualizer dualizer.cc) vci_add_executable (Dualizer dualizer.cc)
target_link_libraries (Dualizer target_link_libraries (Dualizer
OpenMeshCore OpenMeshCore

6
src/OpenMesh/Apps/ProgViewer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
@@ -20,9 +20,9 @@ set( sources
) )
if (WIN32) if (WIN32)
acg_add_executable( ProgViewer WIN32 ${sources} ${headers}) vci_add_executable( ProgViewer WIN32 ${sources} ${headers})
else () else ()
acg_add_executable( ProgViewer ${sources} ${headers}) vci_add_executable( ProgViewer ${sources} ${headers})
endif () endif ()
target_link_libraries ( ProgViewer target_link_libraries ( ProgViewer

6
src/OpenMesh/Apps/QtViewer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
@@ -22,9 +22,9 @@ set (headers
) )
if (WIN32) if (WIN32)
acg_add_executable (QtViewer WIN32 ${sources} ${headers}) vci_add_executable (QtViewer WIN32 ${sources} ${headers})
else () else ()
acg_add_executable (QtViewer ${sources} ${headers}) vci_add_executable (QtViewer ${sources} ${headers})
endif () endif ()
target_link_libraries (QtViewer target_link_libraries (QtViewer

4
src/OpenMesh/Apps/Smoothing/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (Smoothing smooth.cc) vci_add_executable (Smoothing smooth.cc)
target_link_libraries (Smoothing target_link_libraries (Smoothing
OpenMeshCore OpenMeshCore

6
src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
@@ -20,9 +20,9 @@ set (sources
) )
if (WIN32) if (WIN32)
acg_add_executable (SubdividerGui WIN32 ${sources} ${headers}) vci_add_executable (SubdividerGui WIN32 ${sources} ${headers})
else () else ()
acg_add_executable (SubdividerGui ${sources} ${headers}) vci_add_executable (SubdividerGui ${sources} ${headers})
endif () endif ()
target_link_libraries (SubdividerGui target_link_libraries (SubdividerGui

4
src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (commandlineAdaptiveSubdivider ../adaptive_subdivider.cc) vci_add_executable (commandlineAdaptiveSubdivider ../adaptive_subdivider.cc)
target_link_libraries (commandlineAdaptiveSubdivider target_link_libraries (commandlineAdaptiveSubdivider
OpenMeshCore OpenMeshCore

4
src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (commandlineSubdivider ../subdivider.cc) vci_add_executable (commandlineSubdivider ../subdivider.cc)
target_link_libraries (commandlineSubdivider target_link_libraries (commandlineSubdivider
OpenMeshCore OpenMeshCore

4
src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (Analyzer vdpmanalyzer.cc) vci_add_executable (Analyzer vdpmanalyzer.cc)
target_link_libraries (Analyzer target_link_libraries (Analyzer
OpenMeshCore OpenMeshCore

6
src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
@@ -17,9 +17,9 @@ set (sources
if (WIN32) if (WIN32)
acg_add_executable (Synthesizer WIN32 ${sources} ${headers}) vci_add_executable (Synthesizer WIN32 ${sources} ${headers})
else () else ()
acg_add_executable (Synthesizer ${sources} ${headers}) vci_add_executable (Synthesizer ${sources} ${headers})
endif () endif ()
target_link_libraries (Synthesizer target_link_libraries (Synthesizer

4
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../../.. ../../../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
acg_add_executable (mkbalancedpm mkbalancedpm.cc) vci_add_executable (mkbalancedpm mkbalancedpm.cc)
target_link_libraries (mkbalancedpm target_link_libraries (mkbalancedpm
OpenMeshCore OpenMeshCore

4
src/OpenMesh/Apps/mconvert/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../../.. ../../..
) )
acg_add_executable (mconvert mconvert.cc) vci_add_executable (mconvert mconvert.cc)
target_link_libraries (mconvert target_link_libraries (mconvert
OpenMeshCore OpenMeshCore

22
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../.. ../..
@@ -21,12 +21,12 @@ set (directories
) )
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" ${directories}) vci_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories}) vci_append_files (sources "*.cc" ${directories})
# 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(VCI_NO_LIBRARY_INSTALL true)
endif() endif()
@@ -34,14 +34,14 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) vci_add_library (OpenMeshCore SHARED ${sources} ${headers})
else() else()
# OpenMesh has no dll exports so we have to build a static library on windows # OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshCore STATIC ${sources} ${headers}) vci_add_library (OpenMeshCore STATIC ${sources} ${headers})
endif() endif()
else () else ()
acg_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers}) vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
@@ -76,7 +76,7 @@ endif()
# Install Header Files (Apple) # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) if ( NOT VCI_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" ) 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/*.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" ) FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" )
@@ -137,7 +137,7 @@ target_include_directories(OpenMeshCore PUBLIC
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
install(TARGETS OpenMeshCore EXPORT OpenMeshConfig install(TARGETS OpenMeshCore EXPORT OpenMeshConfig
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR} ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR} LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}) RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})

24
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
../.. ../..
@@ -19,16 +19,16 @@ set (directories
) )
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" ${directories}) vci_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories}) vci_append_files (sources "*.cc" ${directories})
IF(WIN32 AND NOT MINGW) IF(WIN32 AND NOT MINGW)
acg_append_files (sources "*.c" ${directories}) vci_append_files (sources "*.c" ${directories})
ENDIF(WIN32 AND NOT MINGW) ENDIF(WIN32 AND NOT MINGW)
# 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(VCI_NO_LIBRARY_INSTALL true)
endif() endif()
@@ -36,14 +36,14 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) vci_add_library (OpenMeshTools SHARED ${sources} ${headers})
else() else()
# OpenMesh has no dll exports so we have to build a static library on windows # OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshTools STATIC ${sources} ${headers}) vci_add_library (OpenMeshTools STATIC ${sources} ${headers})
endif() endif()
else () else ()
acg_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers}) vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
endif () endif ()
@@ -74,7 +74,7 @@ endif()
# Install Header Files (Apple) # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) if ( NOT VCI_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" ) FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" )
FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" ) FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" )
FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" ) FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" )
@@ -120,7 +120,7 @@ target_include_directories(OpenMeshTools PUBLIC
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
install(TARGETS OpenMeshTools EXPORT OpenMeshConfig install(TARGETS OpenMeshTools EXPORT OpenMeshConfig
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR} ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR} LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}) RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})

10
src/Unittests/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon) include (VCICommon)
include_directories ( include_directories (
.. ..
@@ -39,13 +39,13 @@ if ( OPENMESH_BUILD_UNIT_TESTS )
# Create new target named unittests_hexmeshing # Create new target named unittests_hexmeshing
FILE(GLOB UNITTEST_SRC *.cc) FILE(GLOB UNITTEST_SRC *.cc)
# Create unittest executable # Create unittest executable
acg_add_executable(unittests ${UNITTEST_SRC}) vci_add_executable(unittests ${UNITTEST_SRC})
acg_add_executable(unittests_customvec ${UNITTEST_SRC}) vci_add_executable(unittests_customvec ${UNITTEST_SRC})
acg_add_executable(unittests_doublevec ${UNITTEST_SRC}) vci_add_executable(unittests_doublevec ${UNITTEST_SRC})
target_compile_definitions(unittests_customvec PRIVATE TEST_CUSTOM_TRAITS) target_compile_definitions(unittests_customvec PRIVATE TEST_CUSTOM_TRAITS)
target_compile_definitions(unittests_doublevec PRIVATE TEST_DOUBLE_TRAITS) target_compile_definitions(unittests_doublevec PRIVATE TEST_DOUBLE_TRAITS)
# For the unittest we don't want the install rpath as set by acg_add_executable # For the unittest we don't want the install rpath as set by vci_add_executable
set_target_properties ( unittests PROPERTIES BUILD_WITH_INSTALL_RPATH 0 ) set_target_properties ( unittests PROPERTIES BUILD_WITH_INSTALL_RPATH 0 )
set_target_properties ( unittests_customvec PROPERTIES BUILD_WITH_INSTALL_RPATH 0 ) set_target_properties ( unittests_customvec PROPERTIES BUILD_WITH_INSTALL_RPATH 0 )
set_target_properties ( unittests_doublevec PROPERTIES BUILD_WITH_INSTALL_RPATH 0 ) set_target_properties ( unittests_doublevec PROPERTIES BUILD_WITH_INSTALL_RPATH 0 )