Skip to content

Commit

Permalink
[skip ci] Update version number for release. Bootstrap.
Browse files Browse the repository at this point in the history
  • Loading branch information
VolkerEnderlein committed Dec 23, 2019
1 parent df87bb1 commit 44c3875
Show file tree
Hide file tree
Showing 7 changed files with 1,007 additions and 26 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.0)

set(SIMAGE_MAJOR_VERSION "1")
set(SIMAGE_MINOR_VERSION "7")
set(SIMAGE_MICRO_VERSION "1")
set(SIMAGE_BETA_VERSION "a")
set(SIMAGE_MAJOR_VERSION 1)
set(SIMAGE_MINOR_VERSION 8)
set(SIMAGE_MICRO_VERSION 0)
set(SIMAGE_BETA_VERSION)
set(SIMAGE_VERSION ${SIMAGE_MAJOR_VERSION}.${SIMAGE_MINOR_VERSION}.${SIMAGE_MICRO_VERSION}${SIMAGE_BETA_VERSION})

project(simage VERSION ${SIMAGE_MAJOR_VERSION}.${SIMAGE_MINOR_VERSION}.${SIMAGE_MICRO_VERSION})
Expand Down
107 changes: 99 additions & 8 deletions FindSndfile.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,105 @@
include(FindPackageHandleStandardArgs)
#.rst:
# FindSndfile
# --------
#
# Find the sndfile library (libsndfile)
#
# Imported targets
# ^^^^^^^^^^^^^^^^
#
# This module defines the following :prop_tgt:`IMPORTED` targets:
#
# ``sndfile::sndfile``
# The sndfile library, if found.
#
# Result variables
# ^^^^^^^^^^^^^^^^
#
# This module will set the following variables in your project:
#
# ``SNDFILE_FOUND``
# If false, do not try to use sndfile.
# ``SNDFILE_INCLUDE_DIRS``
# where to find sndfile.h, etc.
# ``SNDFILE_LIBRARIES``
# the libraries needed to use sndfile.
#
# Cache variables
# ^^^^^^^^^^^^^^^
#
# The following cache variables may also be set:
#
# ``SNDFILE_INCLUDE_DIRS``
# where to find sndfile.h, etc.
# ``SNDFILE_LIBRARY_RELEASE``
# where to find the sndfile library (optimized).
# ``SNDFILE_LIBRARY_DEBUG``
# where to find the sndfile library (debug).

if(NOT SNDFILE_ROOT)
set(SNDFILE_ROOT $ENV{SNDFILE_ROOT})
endif()
if(SNDFILE_ROOT)
set(_SNDFILE_SEARCH_OPTS NO_DEFAULT_PATH)
else()
set(_SNDFILE_SEARCH_OPTS)
endif()

find_path(SNDFILE_INCLUDE_DIRS NAMES sndfile.h)
find_path(SNDFILE_INCLUDE_DIR NAMES sndfile.h HINTS ${SNDFILE_ROOT} PATH_SUFFIXES include include/sndfile ${_SNDFILE_SEARCH_OPTS})

mark_as_advanced(SNDFILE_INCLUDE_DIRS)
set(sndfile_names ${SNDFILE_NAMES} sndfile sndfile-1 libsndfile libsndfile-1)
foreach(_name ${sndfile_names})
list(APPEND sndfile_names_debug "${_name}d")
endforeach()

find_library(SNDFILE_LIBRARIES NAMES sndfile)
if(NOT SNDFILE_LIBRARY)
find_library(SNDFILE_LIBRARY_RELEASE NAMES ${sndfile_names} HINTS ${SNDFILE_ROOT} PATH_SUFFIXES lib ${_SNDFILE_SEARCH_OPTS})
find_library(SNDFILE_LIBRARY_DEBUG NAMES ${sndfile_names_debug} HINTS ${SNDFILE_ROOT} PATH_SUFFIXES lib ${_SNDFILE_SEARCH_OPTS})
include(SelectLibraryConfigurations)
select_library_configurations(SNDFILE)
mark_as_advanced(SNDFILE_LIBRARY_RELEASE SNDFILE_LIBRARY_DEBUG)
endif()
unset(sndfile_names)
unset(sndfile_names_debug)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
Sndfile
DEFAULT_MSG
SNDFILE_INCLUDE_DIRS
SNDFILE_LIBRARIES
Sndfile
DEFAULT_MSG
SNDFILE_LIBRARY
SNDFILE_INCLUDE_DIR
)

if(SNDFILE_FOUND)
set(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY})
set(SNDFILE_INCLUDE_DIRS "${SNDFILE_INCLUDE_DIR}")

if(NOT TARGET sndfile::sndfile)
add_library(sndfile::sndfile UNKNOWN IMPORTED)
if(SNDFILE_INCLUDE_DIRS)
set_target_properties(sndfile::sndfile PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${SNDFILE_INCLUDE_DIRS}")
endif()
if(EXISTS "${SNDFILE_LIBRARY}")
set_target_properties(sndfile::sndfile PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
IMPORTED_LOCATION "${SNDFILE_LIBRARY}")
endif()
if(EXISTS "${SNDFILE_LIBRARY_RELEASE}")
set_property(TARGET sndfile::sndfile APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(sndfile::sndfile PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
IMPORTED_LOCATION_RELEASE "${SNDFILE_LIBRARY_RELEASE}")
endif()
if(EXISTS "${SNDFILE_LIBRARY_DEBUG}")
set_property(TARGET sndfile::sndfile APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(sndfile::sndfile PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
IMPORTED_LOCATION_DEBUG "${SNDFILE_LIBRARY_DEBUG}")
endif()
endif()
endif()

mark_as_advanced(SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR)
13 changes: 12 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
New in v1.7.1a (so far):
New in v1.8.0 (2019-12-23):
* new:
- Kongsberg Oil & Gas Technologies AS ended SoWin as a commercial product
and re-licensed it under the BSD 3-clause license as a service to the
user community.
- The build system has been migrated from GNU Autotools to CMake
- Support for BitBucket and AppVeyor as continuous integration service providers

* bugfixes:
- Fixed compile issues for newer libpng versions (> v1.4)
- Fixed compile issues for newer giflib versions
- Fixed numerous conversion warnings detected by static code analysis

New in v1.7.0 (2010-02-26):
* Added CGImage based backend on OS X.
Expand Down
15 changes: 15 additions & 0 deletions README.WIN32
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
============================================================================
== BUILDING SIMAGE ON WINDOWS ==
============================================================================

Building Simage on Windows is done by using the CMake build configuration.
Check out the detailed build instructions in the INSTALL file of the Coin
installation directory.

The Autotools build system is still maintained but at a significantly lower
priority.

============================================================================
== OLD INFORMATION ON BUILDING SIMAGE ON WINDOWS ==
============================================================================

NEWSFLASH

You can now build simage the same way you build Coin, by using
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for simage 1.7.1a.
# Generated by GNU Autoconf 2.65 for simage 1.8.0.
#
# Report bugs to <coin-bugs@coin3d.org>.
#
Expand Down Expand Up @@ -706,8 +706,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='simage'
PACKAGE_TARNAME='simage'
PACKAGE_VERSION='1.7.1a'
PACKAGE_STRING='simage 1.7.1a'
PACKAGE_VERSION='1.8.0'
PACKAGE_STRING='simage 1.8.0'
PACKAGE_BUGREPORT='coin-bugs@coin3d.org'
PACKAGE_URL=''

Expand Down Expand Up @@ -1529,7 +1529,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures simage 1.7.1a to adapt to many kinds of systems.
\`configure' configures simage 1.8.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1604,7 +1604,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of simage 1.7.1a:";;
short | recursive ) echo "Configuration of simage 1.8.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1754,7 +1754,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
simage configure 1.7.1a
simage configure 1.8.0
generated by GNU Autoconf 2.65

Copyright (C) 2009 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2521,7 +2521,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by simage $as_me 1.7.1a, which was
It was created by simage $as_me 1.8.0, which was
generated by GNU Autoconf 2.65. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -5281,7 +5281,7 @@ SIMAGE_MINOR_VERSION=7

SIMAGE_MICRO_VERSION=1

SIMAGE_VERSION=1.7.1a
SIMAGE_VERSION=1.8.0

VERSION=$SIMAGE_VERSION

Expand Down Expand Up @@ -26541,7 +26541,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by simage $as_me 1.7.1a, which was
This file was extended by simage $as_me 1.8.0, which was
generated by GNU Autoconf 2.65. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -26607,7 +26607,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
simage config.status 1.7.1a
simage config.status 1.8.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# configure.ac for simage

m4_define([SIMAGE_MAJOR], [1])
m4_define([SIMAGE_MINOR], [7])
m4_define([SIMAGE_MICRO], [1])
m4_define([SIMAGE_BETA], [a])
m4_define([SIMAGE_MINOR], [8])
m4_define([SIMAGE_MICRO], [0])
m4_define([SIMAGE_BETA], [])
m4_define([SIMAGE_VERSION_STRING],
[SIMAGE_MAJOR.SIMAGE_MINOR.SIMAGE_MICRO[]SIMAGE_BETA])

Expand Down

0 comments on commit 44c3875

Please sign in to comment.