From 778a1cd6bb004fd82f01a8289e61811733d3c45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 13 Mar 2012 20:00:20 +0100 Subject: [PATCH] Fix problem with solution folders being generated for MSVC Express Uses MFC header availability to detect Express versions. --- CMakeLists.txt | 6 ++++-- depends/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 367e68f60..a340f2f5c 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) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index d879657e0..4f091ed63 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -8,3 +8,4 @@ add_subdirectory(tthread) OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) add_subdirectory(clsocket) +IDE_FOLDER(clsocket "Depends") \ No newline at end of file