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

Removed the old vci get version call

Browse Source
This commit is contained in:
Jan Möbius
2021-01-20 12:29:24 +01:00
parent 510898ee07
commit 90bb606aa6
7 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -7,10 +7,8 @@ set( CMAKE_CXX_STANDARD 11 )
enable_testing()
# Only set project name if OpenMesh is built as stand-alone library
if("${PROJECT_NAME}" STREQUAL "")
project (OpenMesh)
endif()
project (OpenMesh VERSION 9.0.0)
# Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
@@ -43,9 +41,6 @@ set (CMAKE_DEBUG_POSTFIX "d")
# include our cmake files
include (VCICommon)
vci_get_version ()
# Disable package building when built as an external library
if(${PROJECT_NAME} MATCHES "OpenMesh")
include(OpenMeshPackage)

6
VERSION
View File

@@ -1,6 +0,0 @@
VERSION=9.0
MAJOR=9
MINOR=0
PATCH=0
ID=OPENMESH

2
cmake-library

Submodule cmake-library updated: 05efd8523d...bce3f7ba87

8
cmake/OpenMeshPackage.cmake
View File

@@ -10,10 +10,10 @@ set (CPACK_PACKAGE_NAME "OpenMesh")
set (CPACK_PACKAGE_VENDOR "VCI")
# set version
set (CPACK_PACKAGE_VERSION_MAJOR "${OPENMESH_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${OPENMESH_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${OPENMESH_VERSION_PATCH}")
set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}")
set (CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
# addition package info
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh")

2
openmesh.pc.in
View File

@@ -5,7 +5,7 @@ includedir=${prefix}/include
Name: libOpenMesh
Description: OpenMesh library
Version: @OPENMESH_VERSION_MAJOR@.@OPENMESH_VERSION_MINOR@
Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@
Libs: -L${libdir} @PRIVATE_LIBS@
Cflags: -I${includedir}

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

@@ -42,8 +42,8 @@ if (WIN32)
else ()
vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
endif ()

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

@@ -44,8 +44,8 @@ if (WIN32)
else ()
vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
set_target_properties (OpenMeshTools PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
endif ()
target_link_libraries (OpenMeshTools OpenMeshCore)