anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmkae: more cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34966 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-18 09:46:46 +00:00
parent 23cfb00ef1
commit 99160cd715
2 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
development/cmake/CMakeLists.txt
View File

@ -246,10 +246,10 @@ endif()
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
add_definitions(-DQT_NO_STL -DQT_NO_KEYWORDS) find_package(ICONV REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
include_directories(${CMAKE_BINARY_DIR} ${TOP_SRC_DIR}/src)
if(LYX_ASPELL) if(LYX_ASPELL)
find_package(ASPELL) find_package(ASPELL)
@ -278,12 +278,35 @@ if(LYX_NLS)
endif() endif()
find_package(LyXGettext REQUIRED) find_package(LyXGettext REQUIRED)
include_directories(${TOP_SRC_DIR}/po) include_directories(${TOP_SRC_DIR}/po)
add_subdirectory(po)
endif() endif()
if(LYX_USE_EXTERNAL_LIBINTL) if(LYX_USE_EXTERNAL_LIBINTL)
find_package(Libintl REQUIRED) find_package(Libintl REQUIRED)
add_definitions(-DHAVE_GETTEXT) add_definitions(-DHAVE_GETTEXT) #TODO move to config.h
else()
add_subdirectory(intl)
endif()
if(LYX_USE_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
find_package(Boost COMPONENTS signals regex) #TODO could REQUIRED be used
if(Boost_FOUND)
message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
else()
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else()
if(LYX_USE_TR1_REGEX)
set(Lyx_Boost_Libraries boost_signals)
else()
set(Lyx_Boost_Libraries boost_signals boost_regex)
endif()
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
include_directories(${TOP_SRC_DIR}/boost)
add_subdirectory(boost)
endif() endif()
@ -443,59 +466,23 @@ endif()
configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h) configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
find_package(ICONV REQUIRED)
add_definitions(-DHAVE_ICONV=1)
include_directories(
${CMAKE_BINARY_DIR}
${TOP_SRC_DIR}/src)
if(LYX_USE_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
find_package(Boost COMPONENTS signals regex)
if(Boost_FOUND)
message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
else()
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else()
if(LYX_USE_TR1_REGEX)
set(Lyx_Boost_Libraries boost_signals)
else()
set(Lyx_Boost_Libraries boost_signals boost_regex)
endif()
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
include_directories(${TOP_SRC_DIR}/boost)
add_subdirectory(boost)
endif()
if(NOT LYX_USE_EXTERNAL_LIBINTL)
add_subdirectory(intl)
endif()
add_subdirectory(src) add_subdirectory(src)
if(LYX_INSTALL)
add_subdirectory(man)
FIND_PROGRAM(LYX_PERL_EXECUTABLE perl)
if(NOT ${LYX_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
add_subdirectory(doc)
endif()
endif()
add_subdirectory(lyx2lyx) add_subdirectory(lyx2lyx)
add_subdirectory(scripts) add_subdirectory(scripts)
if(LYX_NLS)
add_subdirectory(po)
endif()
if(LYX_INSTALL) if(LYX_INSTALL)
FIND_PROGRAM(LYX_PERL_EXECUTABLE perl)
if(${LYX_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
message(FATAL_ERROR "Perl required!")
endif()
add_subdirectory(man)
add_subdirectory(doc)
include(../Install) include(../Install)
endif() endif()
SET(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}") SET(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
SET(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}") SET(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")
FILE(STRINGS "${TOP_SRC_DIR}/development/cmake/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY) FILE(STRINGS "${TOP_SRC_DIR}/development/cmake/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY)

5
development/cmake/config.h.cmake
View File

@ -12,6 +12,11 @@
#ifndef _CONFIG_H #ifndef _CONFIG_H
#define _CONFIG_H #define _CONFIG_H
// obligatory flags
#define QT_NO_STL
#define QT_NO_KEYWORDS
#define HAVE_ICONV
#include "configCompiler.h" #include "configCompiler.h"
#ifdef LYX_ENABLE_PCH #ifdef LYX_ENABLE_PCH