diff options
| author | Naios <naios-dev@live.de> | 2016-03-16 17:44:35 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-19 23:19:56 +0100 |
| commit | 90274d0337e5bf62d7e0ab4d08f04419d6f81446 (patch) | |
| tree | 6bc71943b9f2886a7209878de0cdf71c2554ff1d /cmake/showoptions.cmake | |
| parent | a5c2c0c037b7f5fdef49aa37052c9f58e39488db (diff) | |
CMake: Remove the workaround for source groups below CMake 2.8.12
* Set the default option to hierarchical
* Add a new "hierarchical-folders" option which enables folders inside IDE's.
(cherry picked from commit bf773ccc417b47d01502c8151cea6188e33e16aa)
Diffstat (limited to 'cmake/showoptions.cmake')
| -rw-r--r-- | cmake/showoptions.cmake | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 51b22c3a863..b4ef652cf35 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -69,27 +69,10 @@ else() message("* Use coreside debug : No (default)") endif() -if( WITH_SOURCE_TREE STREQUAL "flat" OR WITH_SOURCE_TREE STREQUAL "hierarchical" ) - # TODO: Remove this after Debian 8 is released and set general required version to 2.8.12 - # Debian 7 is shipped with CMake 2.8.9 . But DIRECTORY flag of get_filename_component requires 2.8.12 . - if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) - message("* Show source tree : Yes - ${WITH_SOURCE_TREE}") - set(_WITH_SOURCE_TREE ${WITH_SOURCE_TREE} CACHE INTERNAL "WITH_SOURCE_TREE support enabled.") - else() - message("* Show source tree : No (default)") - - message("") - message(" *** WITH_SOURCE_TREE - WARNING!") - message(" *** This functionality is ONLY supported on CMake 2.8.12 or higher.") - message(" *** You are running ${CMAKE_VERSION}, which does not have the functions needed") - message(" *** to create a sourcetree - this option is thus forced to disabled!") - message("") - - set(_WITH_SOURCE_TREE "" CACHE INTERNAL "WITH_SOURCE_TREE support disabled.") - endif() +if( NOT WITH_SOURCE_TREE STREQUAL "no" ) + message("* Show source tree : Yes - \"${WITH_SOURCE_TREE}\"") else() - message("* Show source tree : No (default)") - set(_WITH_SOURCE_TREE "" CACHE INTERNAL "WITH_SOURCE_TREE support disabled.") + message("* Show source tree : No") endif() if ( WITHOUT_GIT ) |