MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with solution folders being generated for MSVC Express 

Uses MFC header availability to detect Express versions.
develop
Petr Mrázek 2012-03-13 20:00:20 +01:00
parent 6dde2373d7
commit badece1210
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
Unescape Escape View File

@ -11,13 +11,15 @@ else(CMAKE_CONFIGURATION_TYPES)
endif(CMAKE_CONFIGURATION_TYPES) endif(CMAKE_CONFIGURATION_TYPES)
# set up folder structures for IDE solutions # 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) SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON) OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON)
else() else()
OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." OFF) OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." OFF)
endif() endif()
MARK_AS_ADVANCED(CMAKE_USE_FOLDERS)
# macro for setting up IDE folders without nasty IF()s everywhere # macro for setting up IDE folders without nasty IF()s everywhere
MACRO(IDE_FOLDER target folder) MACRO(IDE_FOLDER target folder)

1
depends/CMakeLists.txt
Unescape Escape View File

@ -8,3 +8,4 @@ add_subdirectory(tthread)
OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
add_subdirectory(clsocket) add_subdirectory(clsocket)
IDE_FOLDER(clsocket "Depends")