summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-13 20:00:20 +0100
committerPetr Mrázek2012-03-13 20:00:20 +0100
commitbadece12108d9e937d26ad57fa7238a99098730e (patch)
tree44f07861abc73fc9fe30c6e2a34a2f3eae3b2068
parent6dde2373d7c290f238b2d6a4c7320a2b39ad444f (diff)
downloaddfhack-badece12108d9e937d26ad57fa7238a99098730e.tar.gz
dfhack-badece12108d9e937d26ad57fa7238a99098730e.tar.bz2
dfhack-badece12108d9e937d26ad57fa7238a99098730e.tar.xz
Fix problem with solution folders being generated for MSVC Express
Uses MFC header availability to detect Express versions.
-rw-r--r--CMakeLists.txt6
-rw-r--r--depends/CMakeLists.txt1
2 files changed, 5 insertions, 2 deletions
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)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index d879657e..4f091ed6 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