From 1fbce8c2b617bc62deed228781f163c0359e1c41 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 3 Sep 2006 23:50:16 +0000
Subject: [PATCH] more flexible msvc project folder generation, flat is default

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14887 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/CMakeLists.txt              |  8 +++++---
 development/cmake/intl/CMakeLists.txt         |  2 +-
 development/cmake/modules/LyXMacros.cmake     | 19 +++++++++++++++++++
 .../cmake/modules/ProjectSourceGroup.cmake    | 18 ++++++++++++++++++
 development/cmake/src/CMakeLists.txt          |  2 +-
 .../cmake/src/frontends/CMakeLists.txt        |  2 +-
 .../src/frontends/controllers/CMakeLists.txt  |  2 +-
 .../cmake/src/frontends/qt3/CMakeLists.txt    |  2 +-
 .../cmake/src/frontends/qt4/CMakeLists.txt    |  2 +-
 development/cmake/src/graphics/CMakeLists.txt |  2 +-
 development/cmake/src/insets/CMakeLists.txt   |  2 +-
 development/cmake/src/mathed/CMakeLists.txt   |  2 +-
 development/cmake/src/support/CMakeLists.txt  |  2 +-
 development/cmake/src/tex2lyx/CMakeLists.txt  | 19 +++++++++++--------
 14 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100755 development/cmake/modules/ProjectSourceGroup.cmake

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index c2708c95b7..bfa27f8307 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -1,12 +1,14 @@
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 
-if(NOT CODE_GROUP_NAME)
-set(CODE_GROUP_NAME "The Golden Code")
-endif(NOT CODE_GROUP_NAME)
+if(NOT GROUP_CODE)
+	#set(GROUP_CODE "The Golden Code")
+	set(GROUP_CODE flat)
+endif(NOT GROUP_CODE)
 
 include(LyXPaths)
 include(LyXMacros)
+include(ProjectSourceGroup)
 
 if(release)
 	set(CMAKE_BUILD_TYPE Release)
diff --git a/development/cmake/intl/CMakeLists.txt b/development/cmake/intl/CMakeLists.txt
index 8dd321eb58..6ccbc96fe6 100644
--- a/development/cmake/intl/CMakeLists.txt
+++ b/development/cmake/intl/CMakeLists.txt
@@ -78,5 +78,5 @@ if(ICONV_FOUND)
 	target_link_libraries(intl ${ICONV_LIBRARY})
 endif(ICONV_FOUND)
 
-source_group("${CODE_GROUP_NAME}" FILES ${intl_sources} ${intl_headers})
+project_source_group("${GROUP_CODE}" intl_sources intl_headers)
 
diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index de5b3c62d4..e17339d5b0 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -99,3 +99,22 @@ MACRO (LYX_AUTOMOC)
    endforeach (_current_FILE)
 endmacro (LYX_AUTOMOC)
 
+
+
+# folders in the project
+# mode==flat  : no folders
+# mode==split : standart behavior of cmake, split heders and sources
+# mode== <other values" : code is in this folder
+macro(project_source_group mode sources headers)
+	#message(STATUS ${mode})
+	#message(STATUS ${sources} ${headers})
+	if(${mode} MATCHES "flat")
+		source_group("Source Files" Files)
+		source_group("Header Files" Files)
+	else(${mode} MATCHES "flat")
+		if(NOT ${mode} MATCHES "split")
+			source_group("${mode}" FILES ${${sources}} ${${headers}})
+			source_group("cmake" FILES CMakeLists.txt)
+		endif(NOT ${mode} MATCHES "split")
+	endif(${mode} MATCHES "flat")
+endmacro(project_source_group mode sources headers)
\ No newline at end of file
diff --git a/development/cmake/modules/ProjectSourceGroup.cmake b/development/cmake/modules/ProjectSourceGroup.cmake
new file mode 100755
index 0000000000..713a67a1ed
--- /dev/null
+++ b/development/cmake/modules/ProjectSourceGroup.cmake
@@ -0,0 +1,18 @@
+# folders in the msvc projects
+# mode==flat  : headers and ourses in no folders
+# mode==split : standard behavior of cmake, split headers and sources
+# mode== <other values" : code is in this folder
+macro(project_source_group mode sources headers)
+	#message(STATUS ${mode})
+	#message(STATUS ${sources} ${headers})
+	if(${mode} MATCHES "flat")
+		source_group("Source Files" Files)
+		source_group("Header Files" Files)
+		source_group("cmake" FILES CMakeLists.txt)
+	else(${mode} MATCHES "flat")
+		if(NOT ${mode} MATCHES "split")
+			source_group("${mode}" FILES ${${sources}} ${${headers}})
+		endif(NOT ${mode} MATCHES "split")
+	endif(${mode} MATCHES "flat")
+endmacro(project_source_group mode sources headers)
+
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index da017e44dc..cd3f4c5b7f 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -55,6 +55,6 @@ if(ASPELL_FOUND)
 	target_link_libraries(lyx-${qt_postfix} ${ASPELL_LIBRARY})
 endif(ASPELL_FOUND)
 
-source_group("${CODE_GROUP_NAME}" FILES ${lyx_sources} ${lyx_headers})
+project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
 
diff --git a/development/cmake/src/frontends/CMakeLists.txt b/development/cmake/src/frontends/CMakeLists.txt
index b5e28f57b0..190363f5c2 100644
--- a/development/cmake/src/frontends/CMakeLists.txt
+++ b/development/cmake/src/frontends/CMakeLists.txt
@@ -12,5 +12,5 @@ file(GLOB frontends_headers ${TOP_SRC_DIR}/src/frontends/*.h)
 
 add_library(frontends STATIC ${frontends_sources} ${frontends_headers})
 
-source_group("${CODE_GROUP_NAME}" FILES ${frontends_sources} ${frontends_headers})
+project_source_group("${GROUP_CODE}" frontends_sources frontends_headers)
 
diff --git a/development/cmake/src/frontends/controllers/CMakeLists.txt b/development/cmake/src/frontends/controllers/CMakeLists.txt
index fb3481f550..f186b10eb8 100644
--- a/development/cmake/src/frontends/controllers/CMakeLists.txt
+++ b/development/cmake/src/frontends/controllers/CMakeLists.txt
@@ -9,5 +9,5 @@ add_library(controllers STATIC ${controllers_sources} ${controllers_headers})
 
 target_link_libraries(controllers boost_regex boost_filesystem)
 
-source_group("${CODE_GROUP_NAME}" FILES ${controllers_sources} ${controllers_headers})
+project_source_group("${GROUP_CODE}" controllers_sources controllers_headers)
 
diff --git a/development/cmake/src/frontends/qt3/CMakeLists.txt b/development/cmake/src/frontends/qt3/CMakeLists.txt
index 177e50e9c6..71469c027a 100644
--- a/development/cmake/src/frontends/qt3/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt3/CMakeLists.txt
@@ -35,6 +35,6 @@ if(WIN32)
 	target_link_libraries(frontend_qt3 Gdi32)
 endif(WIN32)
 
-source_group("${CODE_GROUP_NAME}" FILES ${frontends_qt3_sources} ${frontends_qt3_headers})
+project_source_group("${GROUP_CODE}" frontends_qt3_sources frontends_qt3_headers)
 source_group("Uic files" FILES ${frontend_qt3_UI})
 
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 643a498808..edb37a9d91 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -29,6 +29,6 @@ if(WIN32)
 	target_link_libraries(frontend_qt4 Gdi32)
 endif(WIN32)
 
-source_group("${CODE_GROUP_NAME}" FILES ${frontends_qt4_sources} ${frontends_qt4_headers})
+project_source_group("${GROUP_CODE}" frontends_qt4_sources frontends_qt4_headers)
 source_group("Uic files" FILES ${frontend_qt4_UI})
 
diff --git a/development/cmake/src/graphics/CMakeLists.txt b/development/cmake/src/graphics/CMakeLists.txt
index 18ce3aca0f..ceec79683a 100644
--- a/development/cmake/src/graphics/CMakeLists.txt
+++ b/development/cmake/src/graphics/CMakeLists.txt
@@ -7,5 +7,5 @@ include_directories(${TOP_SRC_DIR}/src/graphics)
 
 add_library(graphics STATIC ${graphics_sources} ${graphics_headers})
 
-source_group("${CODE_GROUP_NAME}" FILES ${graphics_sources} ${graphics_headers})
+project_source_group("${GROUP_CODE}" graphics_sources graphics_headers)
 
diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt
index 34bb500cff..4f7fbb746b 100644
--- a/development/cmake/src/insets/CMakeLists.txt
+++ b/development/cmake/src/insets/CMakeLists.txt
@@ -9,5 +9,5 @@ include_directories(${TOP_SRC_DIR}/src/insets)
 
 add_library(insets STATIC ${insets_sources} ${insets_headers})
 
-source_group("${CODE_GROUP_NAME}" FILES ${insets_sources} ${insets_headers})
+project_source_group("${GROUP_CODE}" insets_sources insets_headers)
 
diff --git a/development/cmake/src/mathed/CMakeLists.txt b/development/cmake/src/mathed/CMakeLists.txt
index 92adc4188f..635dbdcd7a 100644
--- a/development/cmake/src/mathed/CMakeLists.txt
+++ b/development/cmake/src/mathed/CMakeLists.txt
@@ -12,5 +12,5 @@ include_directories(${TOP_SRC_DIR}/src/mathed)
 
 add_library(mathed STATIC ${mathed_sources} ${mathed_headers})
 
-source_group("${CODE_GROUP_NAME}" FILES ${mathed_sources} ${mathed_headers})
+project_source_group("${GROUP_CODE}" mathed_sources mathed_headers)
 
diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index b083f3a46f..c25b06a88e 100644
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -27,5 +27,5 @@ if(WIN32)
 	target_link_libraries(support shlwapi)
 endif(WIN32)
 
-source_group("${CODE_GROUP_NAME}" FILES ${support_sources} ${support_headers})
+project_source_group("${GROUP_CODE}" support_sources support_headers)
 
diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index 8af96a6fb3..8872adebb1 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -13,30 +13,33 @@ set(LINKED_FILES
 	../lyxlex_pimpl.C
 )
 
-set(tex2lyx_SRCS 
+set(tex2lyx_sources
    	${LINKED_FILES}
-	Spacing.h 
 	boost.C 
 	context.C 
-	context.h 
 	gettext.C 
-	gettext.h 
 	lengthcommon.C 
 	lyxfont.C 
-	lyxfont.h 
 	texparser.C 
-	texparser.h 
 	tex2lyx.C 
-	tex2lyx.h 
 	preamble.C 
 	math.C 
 	table.C 
 	text.C 
 )
 
+set(tex2lyx_headers
+	Spacing.h 
+	context.h 
+	gettext.h 
+	lyxfont.h 
+	texparser.h 
+	tex2lyx.h 
+)
+
 add_executable(tex2lyx ${tex2lyx_SRCS})
 
 target_link_libraries(tex2lyx  support )
 
-source_group("${CODE_GROUP_NAME}" FILES ${tex2lyx_SRCS})
+project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
-- 
2.39.5