From 445713eae85cdd63670204d3c0167336cf6e70ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sun, 15 May 2011 13:37:18 +0000 Subject: [PATCH] cmake: fix option listing git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38766 a592a061-630c-0410-9148-cb99ea01b6c8 --- CMakeLists.txt | 12 +++++++----- development/cmake/modules/LyXMacros.cmake | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a19a68ac2f..8403ea510b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ cmake_minimum_required(VERSION 2.6.4) + set(LYX_PROJECT lyx) set(LYX_CMAKE_DIR "development/cmake") @@ -36,6 +37,10 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) # Supress regeneration set(CMAKE_SUPPRESS_REGENERATION FALSE) +if(NOT help AND NOT HELP) + # 'project' triggers the searching for a compiler + project(${LYX_PROJECT}) +endif() 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) # APPLE specific -LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF GCC) -LYX_OPTION(COCOA "Use Cocoa on Mac" OFF GCC) +LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC) +LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC) if(help OR HELP) message(STATUS) @@ -95,9 +100,6 @@ if(help OR HELP) message(STATUS) else() -# 'project' triggers the searching for a compiler -project(${LYX_PROJECT}) - # Check option dependencies diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 57c7e7a69d..4d247d9598 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -241,6 +241,8 @@ macro(LYX_OPTION _name _description _default _sys) set(_msg OFF) if(${_sys} MATCHES "GCC") set(_system CMAKE_COMPILER_IS_GNUCXX) + elseif(${_sys} MATCHES "MAC") + set(_system APPLE) else() set(_system ${_sys}) endif()