mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
cmake: we have 2011 and more white space changes, won't call "use tabs" ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37174 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel
parent
cdb3b00033
commit
707eeb22fb
@ -2,8 +2,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006-2010 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
|
||||
|
||||
cmake_minimum_required(VERSION 2.6.4)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
add_subdirectory(libs)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2010, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2010-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(boost)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(boost_regex)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(boost_signals)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008-2010 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
project(doc)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006,2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(intl)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008-2010 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008-2010 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
project(man)
|
||||
@ -11,6 +11,7 @@ SET(_manuals)
|
||||
set(program_suffix ${PROGRAM_SUFFIX})
|
||||
set(version_suffix ${PROGRAM_SUFFIX})
|
||||
set(VERSION "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
|
||||
|
||||
macro(add_manual _mansrc)
|
||||
get_filename_component(_mandest ${_mansrc} NAME_WE)
|
||||
SET(_created_manual "${CMAKE_CURRENT_BINARY_DIR}/${_mandest}${PROGRAM_SUFFIX}.1")
|
||||
|
||||
@ -31,7 +31,6 @@ macro(lyx_add_path _list _prefix)
|
||||
set(_tmp)
|
||||
foreach(_current ${${_list}})
|
||||
set(_tmp ${_tmp} ${_prefix}/${_current})
|
||||
#message(${_prefix}/${_current})
|
||||
endforeach(_current)
|
||||
set(${_list} ${_tmp})
|
||||
endmacro(lyx_add_path _out _prefix)
|
||||
@ -54,8 +53,7 @@ macro(LYX_ADD_UI_FILES _sources _ui)
|
||||
# so we removed the call to LyXuic.cmake
|
||||
add_custom_command(OUTPUT ${_header}
|
||||
COMMAND ${QT_UIC_EXECUTABLE} -tr lyx::qt_ ${_tmp_FILE} -o ${_header}
|
||||
MAIN_DEPENDENCY ${_tmp_FILE}
|
||||
)
|
||||
MAIN_DEPENDENCY ${_tmp_FILE})
|
||||
set(${_ui} ${${_ui}} ${_header})
|
||||
endforeach (_current_FILE)
|
||||
endmacro(LYX_ADD_UI_FILES)
|
||||
@ -118,7 +116,6 @@ macro(LYX_AUTOMOC)
|
||||
else()
|
||||
#message(STATUS "moc not found : ${_abs_FILE} ")
|
||||
endif()
|
||||
|
||||
endif()
|
||||
endforeach (_current_FILE)
|
||||
endmacro (LYX_AUTOMOC)
|
||||
@ -129,7 +126,6 @@ macro(lyx_const_touched_files _allinone_name _list)
|
||||
set(_file_const ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_const.C)
|
||||
set(_file_touched ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_touched.C)
|
||||
|
||||
|
||||
# don't touch exisiting or non-empty file,
|
||||
# so a cmake re-run doesn't touch all created files
|
||||
set(_rebuild_file_const 0)
|
||||
@ -177,6 +173,7 @@ macro(lyx_const_touched_files _allinone_name _list)
|
||||
else()
|
||||
lyx_add_info_files(MergedFiles ${${_list}})
|
||||
endif()
|
||||
|
||||
set(${_file_list} ${_file_const} ${_file_touched} ${lyx_${groupname}_info_files})
|
||||
|
||||
foreach (_current_FILE ${${_list}})
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008, 2009 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
project(po)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008, 2009 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
if (UNIX)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2008, 2009 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2008-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
set(_lyxclient lyxclient${PROGRAM_SUFFIX})
|
||||
@ -14,8 +14,10 @@ file(GLOB _lyxclient_headers ${TOP_SRC_DIR}/src/client/*.h)
|
||||
list(REMOVE_ITEM _lyxclient_headers "${TOP_SRC_DIR}/src/client/pch.h")
|
||||
list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
|
||||
|
||||
include_directories(BEFORE "${TOP_SRC_DIR}/src/client"
|
||||
"${TOP_SRC_DIR}/boost" ${ZLIB_INCLUDE_DIR})
|
||||
include_directories(BEFORE
|
||||
"${TOP_SRC_DIR}/src/client"
|
||||
"${TOP_SRC_DIR}/boost"
|
||||
${ZLIB_INCLUDE_DIR})
|
||||
|
||||
add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(frontends)
|
||||
|
||||
@ -1,23 +1,20 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(frontend_qt4)
|
||||
|
||||
file(GLOB frontends_qt4_sources
|
||||
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
|
||||
file(GLOB frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
|
||||
file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES})
|
||||
|
||||
list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .)
|
||||
list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp)
|
||||
list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/Resources.cpp)
|
||||
|
||||
file(GLOB frontends_qt4_headers
|
||||
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
|
||||
file(GLOB frontend_qt4_UI
|
||||
${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
|
||||
file(GLOB frontends_qt4_headers ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
|
||||
file(GLOB frontend_qt4_UI ${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
|
||||
|
||||
lyx_add_msvc_pch(frontends_qt4)
|
||||
|
||||
@ -45,15 +42,12 @@ endif()
|
||||
if(LYX_MERGE_FILES)
|
||||
lyx_const_touched_files(_allinone frontends_qt4_sources)
|
||||
set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
|
||||
set_source_files_properties(_allinone_const.C
|
||||
PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
|
||||
set_source_files_properties(_allinone_touched.C
|
||||
PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
|
||||
set_source_files_properties(_allinone_const.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
|
||||
set_source_files_properties(_allinone_touched.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
|
||||
add_library(frontend_qt4 ${library_type}
|
||||
${_allinone_files} ${frontends_qt4_headers} ${ui_files} ${resource_files})
|
||||
else()
|
||||
add_library(frontend_qt4 ${library_type}
|
||||
${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files} ${resource_files})
|
||||
add_library(frontend_qt4 ${library_type} ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files} ${resource_files})
|
||||
endif()
|
||||
|
||||
|
||||
@ -68,8 +62,7 @@ if(WIN32)
|
||||
target_link_libraries(frontend_qt4 Gdi32)
|
||||
endif()
|
||||
|
||||
project_source_group("${GROUP_CODE}"
|
||||
frontends_qt4_sources frontends_qt4_headers)
|
||||
project_source_group("${GROUP_CODE}" frontends_qt4_sources frontends_qt4_headers)
|
||||
|
||||
source_group("Uic files" FILES ${frontend_qt4_UI})
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(graphics)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(insets)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011, Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(mathed)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, Peter K<EFBFBD>mmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
#
|
||||
|
||||
project(support)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# This file is part of LyX, the document processor.
|
||||
# Licence details can be found in the file COPYING.
|
||||
#
|
||||
# Copyright (c) 2006, 2008, 2009 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||
#
|
||||
|
||||
set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
|
||||
@ -24,14 +24,15 @@ file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
|
||||
|
||||
file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})
|
||||
|
||||
include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx
|
||||
${TOP_SRC_DIR}/src/support/minizip ${ZLIB_INCLUDE_DIR})
|
||||
include_directories(BEFORE
|
||||
${TOP_SRC_DIR}/src/tex2lyx
|
||||
${TOP_SRC_DIR}/src/support/minizip
|
||||
${ZLIB_INCLUDE_DIR})
|
||||
|
||||
add_definitions(-DTEX2LYX)
|
||||
|
||||
if(NOT LYX_MERGE_FILES)
|
||||
add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources}
|
||||
${tex2lyx_headers} ${LINKED_headers})
|
||||
add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers})
|
||||
else()
|
||||
lyx_const_touched_files(_allinone tex2lyx_sources)
|
||||
lyx_const_touched_files(_allinone_linked LINKED_sources)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user