anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to cmake 2.4.4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16028 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2006-11-24 15:10:16 +00:00
parent 2fc592cf73
commit 5524f5f857
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
development/cmake/CMakeLists.txt
View File

@ -4,6 +4,9 @@
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
#
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
@ -89,20 +92,12 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h )
if(MSVC)
if(MSVC_IDE)
add_definitions(-DBOOST_USER_CONFIG=&lt\;config.h&gt\;)
else(MSVC_IDE)
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
SET(CMAKE_EXE_LINKER_FLAGS /MANIFEST)
endif(MSVC_IDE)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
# disable checked iterators for msvc release builds to get maximum speed
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
else(MSVC)
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
endif(MSVC)
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
if(MSVC AND NOT disable-pch)
configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h)

11
development/cmake/intl/CMakeLists.txt
View File

@ -25,21 +25,12 @@ add_definitions(
)
if(MSVC_IDE)
add_definitions(
-DLOCALEDIR="${LOCALE_DIR}"
-DLOCALE_ALIAS_PATH="${LOCALE_DIR}"
-DLIBDIR="${TOP_SRC_DIR}"
-DINSTALLDIR="${PREFIX}"
)
else(MSVC_IDE)
add_definitions(
add_definitions(
-DLOCALEDIR=\\"${LOACLE_DIR}\\"
-DLOCALE_ALIAS_PATH=\\"${LOACLE_DIR}\\"
-DLIBDIR=\\"${TOP_SRC_DIR}\\"
-DINSTALLDIR=\\"${PREFIX}\\"
)
endif(MSVC_IDE)
file(GLOB intl_headers ${TOP_SRC_DIR}/intl/*.h)

18
development/cmake/modules/MacroAddFileDependencies.cmake
View File

@ -1,18 +0,0 @@
#
# kdelibs file
#
# - MACRO_ADD_FILE_DEPENDENCIES(<_file> depend_files...)
# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
MACRO (MACRO_ADD_FILE_DEPENDENCIES _file)
GET_SOURCE_FILE_PROPERTY(_deps ${_file} OBJECT_DEPENDS)
if (_deps)
set(_deps ${_deps} ${ARGN})
else (_deps)
set(_deps ${ARGN})
endif (_deps)
SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES OBJECT_DEPENDS "${_deps}")
ENDMACRO (MACRO_ADD_FILE_DEPENDENCIES)