blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 09:09:03 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Change DSO versioning scheme"

Browse Source 
This reverts commit 51205551f50d65994d54bfa19b2f61c26c91af17.
This commit is contained in:
Nick Black 2020-05-28 17:24:11 -04:00
parent 51205551f5
commit 478ebadd64
5 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
CMakeLists.txt
View File

@ -1,38 +1,8 @@
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
project(notcurses VERSION 1.4.3
# Shared library versioning is done in the same way as SDL:
#
# If the version changes, then:
#
# NOTCURSES_VERSION_MICRO += 1;
# NOTCURSES_INTERFACE_AGE += 1;
# NOTCURSES_BINARY_AGE += 1;
# if any functions/classes/methods have been added, set NOTCURSES_INTERFACE_AGE to 0.
# if backwards compatibility has been broken,
# set NOTCURSES_BINARY_AGE and NOTCURSES_INTERFACE_AGE to 0.
set(NOTCURSES_VERSION_MAJOR 1)
set(NOTCURSES_VERSION_MINOR 5)
set(NOTCURSES_VERSION_MICRO 0)
set(NOTCURSES_INTERFACE_AGE 0)
set(NOTCURSES_BINARY_AGE 1)
set(NOTCURSES_VERSION "${NOTCURSES_VERSION_MAJOR}.${NOTCURSES_VERSION_MINOR}.${NOTCURSES_VERSION_MICRO}")
# Calculate a libtool-like version number (taken from SDL2 CMakeLists.txt)
math(EXPR LT_CURRENT "${NOTCURSES_VERSION_MICRO} - ${NOTCURSES_INTERFACE_AGE}")
math(EXPR LT_AGE "${NOTCURSES_BINARY_AGE} - ${NOTCURSES_INTERFACE_AGE}")
math(EXPR LT_MAJOR "${LT_CURRENT} - ${LT_AGE}")
set(LT_REVISION "${NOTCURSES_INTERFACE_AGE}")
set(LT_RELEASE "${NOTCURSES_VERSION_MAJOR}.${NOTCURSES_VERSION_MINOR}")
set(LT_VERSION "${LT_MAJOR}.${LT_AGE}.${LT_REVISION}")
project(notcurses VERSION ${NOTCURSES_VERSION_MAJOR}.${NOTCURSES_VERSION_MINOR}.${NOTCURSES_VERSION_MICRO}
DESCRIPTION "UI for modern terminal emulators" DESCRIPTION "UI for modern terminal emulators"
HOMEPAGE_URL "https://nick-black.com/dankwiki/index.php/notcurses" HOMEPAGE_URL "https://nick-black.com/dankwiki/index.php/notcurses"
LANGUAGES C CXX) LANGUAGES C CXX)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_C_VISIBILITY_PRESET hidden)
@ -124,15 +94,17 @@ add_library(notcurses-static STATIC EXCLUDE_FROM_ALL ${NCSRCS})
endif() endif()
set_target_properties( set_target_properties(
notcurses-static PROPERTIES notcurses-static PROPERTIES
OUTPUT_NAME notcurses-${LT_RELEASE} OUTPUT_NAME notcurses
) )
set_target_properties(notcurses PROPERTIES set_target_properties(notcurses PROPERTIES
VERSION ${NOTCURSES_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${LT_REVISION} SOVERSION ${PROJECT_VERSION_MAJOR}
OUTPUT_NAME notcurses-${LT_RELEASE} )
set_target_properties(notcurses-static PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}
) )
target_include_directories(notcurses target_include_directories(notcurses
PRIVATE PRIVATE
include include
@ -267,14 +239,14 @@ add_library(notcurses++-static STATIC EXCLUDE_FROM_ALL ${NCPP_SOURCES})
endif() endif()
set_target_properties( set_target_properties(
notcurses++-static PROPERTIES notcurses++-static PROPERTIES
OUTPUT_NAME notcurses++-${LT_RELEASE} OUTPUT_NAME notcurses++
) )
set_target_properties( set_target_properties(
notcurses++ PROPERTIES notcurses++ PROPERTIES
VERSION ${NOTCURSES_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${LT_REVISION} SOVERSION ${PROJECT_VERSION_MAJOR}
OUTPUT_NAME notcurses++-${LT_RELEASE}) OUTPUT_NAME "notcurses++")
set(NCPP_INCLUDE_DIRS set(NCPP_INCLUDE_DIRS
include include

6
tools/notcurses++.pc.in
View File

@ -5,8 +5,8 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: @PROJECT_NAME@ Name: @PROJECT_NAME@
Description: C++ bindings for notcurses Description: C++ bindings for notcurses
Version: @NOTCURSES_VERSION@ Version: @PROJECT_VERSION@
Requires: notcurses = @NOTCURSES_VERSION@ Requires: notcurses >= @PROJECT_VERSION@
Libs: -L${libdir} -lnotcurses++-@LT_RELEASE@ Libs: -L${libdir} -lnotcurses++
Cflags: -I${includedir} Cflags: -I${includedir}

4
tools/notcurses.pc.in
View File

@ -5,8 +5,8 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: @PROJECT_NAME@ Name: @PROJECT_NAME@
Description: TUI library for modern terminal emulators Description: TUI library for modern terminal emulators
Version: @NOTCURSES_VERSION@ Version: @PROJECT_VERSION@
Requires: Requires:
Libs: -L${libdir} -lnotcurses-@LT_RELEASE@ Libs: -L${libdir} -lnotcurses
Cflags: -I${includedir} Cflags: -I${includedir}

2
tools/notcursesConfig.cmake.in
View File

@ -6,4 +6,4 @@ get_filename_component(NOTCURSES_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(NOTCURSES_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") set(NOTCURSES_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
set(NOTCURSES_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@") set(NOTCURSES_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
set(notcurses_LIBRARIES -lnotcurses-@LT_RELEASE@) set(notcurses_LIBRARIES -lnotcurses)

2
tools/setup.py.in
View File

@ -6,7 +6,7 @@ def read(fname):
setup( setup(
name="notcurses", name="notcurses",
version="${NOTCURSES_VERSION}", version="${PROJECT_VERSION}",
packages=['notcurses'], packages=['notcurses'],
package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}/python/src' }, package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}/python/src' },
author="Nick Black", author="Nick Black",