anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Correct the previous commit.

Browse Source 
We have to apply configure_file() twice, therefor the new file.
This commit is contained in:
Kornel Benko 2013-02-12 17:40:32 +01:00
parent 5970aff01a
commit ae04b1a18e
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -696,6 +696,8 @@ if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h) configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h)
else() else()
include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake) 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) configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
endif() endif()

2
development/cmake/configCompiler.h.cmake
View File

@ -30,7 +30,7 @@
#cmakedefine HAVE_IOS 1 #cmakedefine HAVE_IOS 1
#cmakedefine HAVE_LOCALE 1 #cmakedefine HAVE_LOCALE 1
${Function_Defines} #include "configCompiler.h"
#cmakedefine HAVE_STD_COUNT 1 #cmakedefine HAVE_STD_COUNT 1
#cmakedefine HAVE_ASPRINTF 1 #cmakedefine HAVE_ASPRINTF 1

17
development/cmake/configFunctions.cmake Normal file
View File

@ -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