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()