From 00f5d2f8ffc5021fcf75e1bddbf13eabb27ec8d2 Mon Sep 17 00:00:00 2001 From: Philip Trettner Date: Mon, 14 Apr 2014 12:09:55 +0200 Subject: [PATCH] Moved macro for msvc source folding --- CMakeLists.txt | 21 +-------------------- CMakeListsStaticInclude.txt | 2 ++ cmake | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f378c50..1fff9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,26 +5,7 @@ # CMAKE_MINIMUM_REQUIRED (VERSION 2.6) -################################################################################ -# Macro to sort acgl into directories -################################################################################ - -MACRO (RECURSE_GROUPS dirname) - FILE(GLOB_RECURSE allfiles "${dirname}/*.*") - SET(ALL_FILES ${ALL_FILES} ${allfiles}) - STRING(REGEX REPLACE ".*/([^/]*)" "\\1" maindir "${dirname}") - - FOREACH(file ${allfiles}) - STRING(REGEX REPLACE "${dirname}/(.*)/[^/]*" "\\1" loopdirname "${file}") - STRING(REGEX REPLACE "/" "\\\\" loopdirname "${loopdirname}") - - IF(NOT "${file}" MATCHES "${dirname}/(.*)/[^/]*") - source_group("${maindir}" FILES ${file}) - ELSE() - source_group("${maindir}\\${loopdirname}" FILES ${file}) - ENDIF() - ENDFOREACH() -ENDMACRO (RECURSE_GROUPS) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeMacros.txt) ################################################################################ # Global Settings diff --git a/CMakeListsStaticInclude.txt b/CMakeListsStaticInclude.txt index 4a4fd58..2090615 100644 --- a/CMakeListsStaticInclude.txt +++ b/CMakeListsStaticInclude.txt @@ -4,6 +4,8 @@ # e.g.: INCLUDE(${CMAKE_SOURCE_DIR}/extern/acgl/CMakeListsStaticInclude.txt) # +include(${CMAKE_CURRENT_LIST_DIR}/cmake/CMakeMacros.txt) + SET(ACGL_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}") # Find all used files of certain file-types FILE(GLOB_RECURSE SOURCE_FILES_C "${ACGL_BASE_DIR}/src/*.c") diff --git a/cmake b/cmake index a0eb0dd..c4eead9 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a0eb0dda91ce5d621d47de52bcecdd494b00e353 +Subproject commit c4eead9bcb430fed3e99ee0df0f2b06559df5db4 -- GitLab