Author: kuemmel
Date: Sun May 15 15:37:18 2011
New Revision: 38766
URL: http://www.lyx.org/trac/changeset/38766
Log:
cmake: fix option listing
Modified:
lyx-devel/trunk/CMakeLists.txt
lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Sun May 15 15:21:18 2011 (r38765)
+++ lyx-devel/trunk/CMakeLists.txt Sun May 15 15:37:18 2011 (r38766)
@@ -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 @@
# 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(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 @@
message(STATUS)
else()
-# 'project' triggers the searching for a compiler
-project(${LYX_PROJECT})
-
# Check option dependencies
Modified: lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake Sun May 15
15:21:18 2011 (r38765)
+++ lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake Sun May 15
15:37:18 2011 (r38766)
@@ -241,6 +241,8 @@
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()
