From 778a1cd6bb004fd82f01a8289e61811733d3c45b Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Tue, 13 Mar 2012 20:00:20 +0100 Subject: Fix problem with solution folders being generated for MSVC Express Uses MFC header availability to detect Express versions. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 367e68f6..a340f2f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,13 +11,15 @@ else(CMAKE_CONFIGURATION_TYPES) endif(CMAKE_CONFIGURATION_TYPES) # set up folder structures for IDE solutions -if(NOT CMAKE_USING_VC_FREE_TOOLS) +# MSVC Express won't load solutions that use this. It also doesn't include MFC supported +# Check for MFC! +find_package(MFC QUIET) +if(MFC_FOUND OR (NOT MSVC)) SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON) else() OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." OFF) endif() -MARK_AS_ADVANCED(CMAKE_USE_FOLDERS) # macro for setting up IDE folders without nasty IF()s everywhere MACRO(IDE_FOLDER target folder) -- cgit v1.2.1