diff options
| author | Petr Mrázek | 2012-03-13 20:00:20 +0100 |
|---|---|---|
| committer | Quietust | 2012-03-13 15:36:43 -0500 |
| commit | 778a1cd6bb004fd82f01a8289e61811733d3c45b (patch) | |
| tree | 6fbfbf44058efb090e91e6528ac17bbe05b1fbc1 | |
| parent | 181f1c6ac660618537d5ae22b6a5d26c36f58e93 (diff) | |
| download | dfhack-778a1cd6bb004fd82f01a8289e61811733d3c45b.tar.gz dfhack-778a1cd6bb004fd82f01a8289e61811733d3c45b.tar.bz2 dfhack-778a1cd6bb004fd82f01a8289e61811733d3c45b.tar.xz | |
Fix problem with solution folders being generated for MSVC Express
Uses MFC header availability to detect Express versions.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | depends/CMakeLists.txt | 1 |
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 |
