Skip to content

Commit

Permalink
cmake: Clarify GetCommonName() and plugin naming.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alec Leamas committed Mar 22, 2020
1 parent 6220a45 commit 5fbfdb8
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set(OpenGL_GL_PREFERENCE "LEGACY")
PROJECT(oesenc_pi)

SET(PACKAGE_NAME oesenc_pi)
SET(VERBOSE_NAME oesenc)
SET(COMMON_NAME oeSENC) # Must be the same as returned by GetCommonName()
MESSAGE (STATUS "*** Building ${PACKAGE_NAME} ***")

include("VERSION.cmake")
Expand All @@ -35,7 +35,7 @@ SET(PKG_API_VERSION "1.16")
SET(PKG_AUTHOR "David S Register")

# NVR: <Name-version>[-release]
SET(PKG_NVR ${PACKAGE_NAME}-${PACKAGE_VERSION})
SET(PKG_NVR ${COMMON_NAME}-${PACKAGE_VERSION})

# The @keyword@ references are patched to actual values by upload script.
SET(TARBALL_URL "https://dl.cloudsmith.io/public/@pkg_repo@/raw")
Expand Down Expand Up @@ -181,7 +181,6 @@ if (OCPN_FLATPAK)
${CMAKE_SOURCE_DIR}/pkg_version.sh.in
${CMAKE_CURRENT_BINARY_DIR}/pkg_version.sh
)
set(PLUGIN_NAME ${VERBOSE_NAME}-plugin-${PKG_TARGET}-${PKG_TARGET_VERSION})

find_program(TAR NAMES gtar tar)
if (NOT TAR)
Expand Down Expand Up @@ -599,9 +598,9 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/pkg_version.sh
)

set(PLUGIN_NAME ${VERBOSE_NAME}-plugin-${PKG_TARGET}-${PKG_TARGET_VERSION})
set(XML_NAME ${COMMON_NAME}-plugin-${PKG_TARGET}-${PKG_TARGET_VERSION})

configure_file(
${CMAKE_SOURCE_DIR}/oesenc-plugin.xml.in
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.xml
${CMAKE_CURRENT_BINARY_DIR}/${XML_NAME}.xml
)

0 comments on commit 5fbfdb8

Please sign in to comment.