Fix problem with solution folders being generated for MSVC Express

Uses MFC header availability to detect Express versions.
WaterFace · Mar 13, 2012 · badece1 · badece1
1 parent 6dde237
commit badece1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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")