The branch, master, has been updated. - Log -----------------------------------------------------------------
commit ae04b1a18e66e5030843c585acee88bd91ad380a Author: Kornel Benko <[email protected]> Date: Tue Feb 12 17:40:32 2013 +0100 Cmake build: Correct the previous commit. We have to apply configure_file() twice, therefor the new file. diff --git a/CMakeLists.txt b/CMakeLists.txt index abf9ce0..68c7d03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,6 +696,8 @@ if(MSVC AND NOT LYX_CONFIGURE_CHECKS) configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h) else() include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake) + configure_file(${LYX_CMAKE_DIR}/configFunctions.cmake ${TOP_BINARY_DIR}/configFunctions.h.cmake) + configure_file(${TOP_BINARY_DIR}/configFunctions.h.cmake ${TOP_BINARY_DIR}/configFunctions.h) configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h) endif() diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake index 904671e..fc63048 100644 --- a/development/cmake/configCompiler.h.cmake +++ b/development/cmake/configCompiler.h.cmake @@ -30,7 +30,7 @@ #cmakedefine HAVE_IOS 1 #cmakedefine HAVE_LOCALE 1 -${Function_Defines} +#include "configCompiler.h" #cmakedefine HAVE_STD_COUNT 1 #cmakedefine HAVE_ASPRINTF 1 diff --git a/development/cmake/configFunctions.cmake b/development/cmake/configFunctions.cmake new file mode 100644 index 0000000..eaaabba --- /dev/null +++ b/development/cmake/configFunctions.cmake @@ -0,0 +1,17 @@ +/* + * \file configFunctions.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * This is the compilation configuration file for LyX. + * It was generated by cmake. + * You might want to change some of the defaults if something goes wrong + * during the compilation. + */ + +#ifndef _CONFIG_FUNCTIONS_H +#define _CONFIG_FUNCTION_H + +${Function_Defines} + +#endif ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 2 ++ development/cmake/configCompiler.h.cmake | 2 +- .../{lyx_date.h.cmake => configFunctions.cmake} | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) copy development/cmake/{lyx_date.h.cmake => configFunctions.cmake} (75%) hooks/post-receive -- The LyX Source Repository
