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

cmake: fix option listing

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38766 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-05-15 13:37:18 +00:00
parent 41a0adcb47
commit 445713eae8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -6,6 +6,7 @@
cmake_minimum_required(VERSION 2.6.4) cmake_minimum_required(VERSION 2.6.4)
set(LYX_PROJECT lyx) set(LYX_PROJECT lyx)
set(LYX_CMAKE_DIR "development/cmake") set(LYX_CMAKE_DIR "development/cmake")
@ -36,6 +37,10 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
# Supress regeneration # Supress regeneration
set(CMAKE_SUPPRESS_REGENERATION FALSE) set(CMAKE_SUPPRESS_REGENERATION FALSE)
if(NOT help AND NOT HELP)
# 'project' triggers the searching for a compiler
project(${LYX_PROJECT})
endif()
include(LyXMacros) include(LyXMacros)
@ -84,8 +89,8 @@ LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC) LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
# APPLE specific # APPLE specific
LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF GCC) LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC)
LYX_OPTION(COCOA "Use Cocoa on Mac" OFF GCC) LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC)
if(help OR HELP) if(help OR HELP)
message(STATUS) message(STATUS)
@ -95,9 +100,6 @@ if(help OR HELP)
message(STATUS) message(STATUS)
else() else()
# 'project' triggers the searching for a compiler
project(${LYX_PROJECT})
# Check option dependencies # Check option dependencies

2
development/cmake/modules/LyXMacros.cmake
View File

@ -241,6 +241,8 @@ macro(LYX_OPTION _name _description _default _sys)
set(_msg OFF) set(_msg OFF)
if(${_sys} MATCHES "GCC") if(${_sys} MATCHES "GCC")
set(_system CMAKE_COMPILER_IS_GNUCXX) set(_system CMAKE_COMPILER_IS_GNUCXX)
elseif(${_sys} MATCHES "MAC")
set(_system APPLE)
else() else()
set(_system ${_sys}) set(_system ${_sys})
endif() endif()