diff --git a/CMakeLists.txt b/CMakeLists.txt index d032ed2..00d98b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ INCLUDE(AddTargetProperties) PROJECT(scgi-cgi C) -SET(PACKAGE_VERSION 0.1.0) +SET(PACKAGE_VERSION 0.1.1) IF("${CMAKE_BUILD_TYPE}" STREQUAL "") SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) diff --git a/Makefile.am b/Makefile.am index 9aba7bf..3d27fb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST=autogen.sh CMakeLists.txt config.h.cmake scgi-cgi.1 README.rst +EXTRA_DIST=autogen.sh CMakeLists.txt cmake config.h.cmake scgi-cgi.1 README.rst man1_MANS=scgi-cgi.1 AM_CFLAGS=$(LIBEVENT_CFLAGS) diff --git a/Makefile.in b/Makefile.in index b60354f..71881b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -294,7 +294,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = autogen.sh CMakeLists.txt config.h.cmake scgi-cgi.1 README.rst +EXTRA_DIST = autogen.sh CMakeLists.txt cmake config.h.cmake scgi-cgi.1 README.rst man1_MANS = scgi-cgi.1 AM_CFLAGS = $(LIBEVENT_CFLAGS) scgi_cgi_LDADD = $(LIBEVENT_LIBS) diff --git a/cmake/AddTargetProperties.cmake b/cmake/AddTargetProperties.cmake new file mode 100644 index 0000000..17ee774 --- /dev/null +++ b/cmake/AddTargetProperties.cmake @@ -0,0 +1,13 @@ +MACRO(ADD_TARGET_PROPERTIES _target _name) + SET(_properties) + FOREACH(_prop ${ARGN}) + SET(_properties "${_properties} ${_prop}") + ENDFOREACH(_prop) + GET_TARGET_PROPERTY(_old_properties ${_target} ${_name}) + MESSAGE(STATUS "adding property to ${_target} ${_name}:" ${_properties}) + IF(NOT _old_properties) + # in case it's NOTFOUND + SET(_old_properties) + ENDIF(NOT _old_properties) + SET_TARGET_PROPERTIES(${_target} PROPERTIES ${_name} "${_old_properties} ${_properties}") +ENDMACRO(ADD_TARGET_PROPERTIES) diff --git a/configure b/configure index 86d0670..2277a8a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for scgi-cgi 0.1.0. +# Generated by GNU Autoconf 2.69 for scgi-cgi 0.1.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='scgi-cgi' PACKAGE_TARNAME='scgi-cgi' -PACKAGE_VERSION='0.1.0' -PACKAGE_STRING='scgi-cgi 0.1.0' +PACKAGE_VERSION='0.1.1' +PACKAGE_STRING='scgi-cgi 0.1.1' PACKAGE_BUGREPORT='lighttpd@stbuehler.de' PACKAGE_URL='' @@ -1277,7 +1277,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 scgi-cgi 0.1.0 to adapt to many kinds of systems. +\`configure' configures scgi-cgi 0.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1343,7 +1343,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of scgi-cgi 0.1.0:";; + short | recursive ) echo "Configuration of scgi-cgi 0.1.1:";; esac cat <<\_ACEOF @@ -1444,7 +1444,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -scgi-cgi configure 0.1.0 +scgi-cgi configure 0.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1867,7 +1867,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 scgi-cgi $as_me 0.1.0, which was +It was created by scgi-cgi $as_me 0.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2734,7 +2734,7 @@ fi # Define the identity of the package. PACKAGE='scgi-cgi' - VERSION='0.1.0' + VERSION='0.1.1' cat >>confdefs.h <<_ACEOF @@ -5310,7 +5310,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 scgi-cgi $as_me 0.1.0, which was +This file was extended by scgi-cgi $as_me 0.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5376,7 +5376,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="\\ -scgi-cgi config.status 0.1.0 +scgi-cgi config.status 0.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f089d42..eb1d7c6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([scgi-cgi], [0.1.0], [lighttpd@stbuehler.de]) +AC_INIT([scgi-cgi], [0.1.1], [lighttpd@stbuehler.de]) AC_CONFIG_SRCDIR([scgi-cgi.c]) AC_CONFIG_HEADERS([config.h])