Re: [patch] CMakeLists.txt and config.h.cmake

This is a multi-part message in MIME format.
--------------090301010302060808030402
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

This also got propagated into the cmake for sipwitch.  Both are fixed
now.  Thanks!

On 03/21/2011 07:39 AM, Pietro Cerutti wrote:
> Hi,
> 
> The configure_file CMake directive has to appear after the variables
> used in the configuration file have been set, otherwise the effect is
> not the desired one. In particular, check_include_files must appear
> before configure_file.
> 
> This patch solves the problem.
> 
> 
> --- CMakeLists.txt.orig	2011-03-21 12:41:35.000000000 +0100
> +++ CMakeLists.txt	2011-03-21 12:41:51.000000000 +0100
> @@ -31,8 +31,6 @@
>  # set to true for debug and trace during CMakeLists development
>  set(CMAKE_VERBOSE_MAKEFILE FALSE)
>  
> -configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
> -
>  # Set defaults and pass common options.  Common build options can be passed
>  # to cmake using cmake -DWITH_CFLAGS="...", WITH_LIBS, and WITH_INCLUDES
>  include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/inc ${WITH_INCLUDES})
> @@ -117,6 +115,8 @@
>      endif()
>  endif()
>  
> +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
> +
>  file(GLOB ccaudio_src src/*.cpp)
>  set(ccaudio_inc inc/ccaudio2.h)
>  add_library(ccaudio ${BUILD_LIBRARY_TYPE} ${ccaudio_src} ${ccaudio_inc})
> 
> 
> 
> 
> 
> _______________________________________________
> Ccaudio-devel mailing list
> [email protected]
> http://lists.gnu.org/mailman/listinfo/ccaudio-devel

--------------090301010302060808030402
Content-Type: text/x-vcard; charset=utf-8;
 name="dyfet.vcf"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="dyfet.vcf"

begin:vcard
fn:David Sugar
n:Sugar;David
org:GNU Telephony
email;internet:[email protected]
tel;work:+1 609 465 5336
url:http://www.gnutelephony.org
version:2.1
end:vcard


--------------090301010302060808030402
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Ccaudio-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/ccaudio-devel

--------------090301010302060808030402--