diff --git a/Demos/Demo_Colour/Demo_Colour.list b/Demos/Demo_Colour/Demo_Colour.list index 4333a84ccc..0caa4abeb9 100644 --- a/Demos/Demo_Colour/Demo_Colour.list +++ b/Demos/Demo_Colour/Demo_Colour.list @@ -21,4 +21,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Console/Demo_Console.list b/Demos/Demo_Console/Demo_Console.list index 1c4f56fe53..5fd2b267a7 100644 --- a/Demos/Demo_Console/Demo_Console.list +++ b/Demos/Demo_Console/Demo_Console.list @@ -17,4 +17,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Controllers/Demo_Controllers.list b/Demos/Demo_Controllers/Demo_Controllers.list index ae5b4f040e..88340aafbf 100644 --- a/Demos/Demo_Controllers/Demo_Controllers.list +++ b/Demos/Demo_Controllers/Demo_Controllers.list @@ -17,4 +17,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Gui/Demo_Gui.list b/Demos/Demo_Gui/Demo_Gui.list index e95b9674cd..dd3b1b704e 100644 --- a/Demos/Demo_Gui/Demo_Gui.list +++ b/Demos/Demo_Gui/Demo_Gui.list @@ -39,4 +39,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_ItemBox/Demo_ItemBox.list b/Demos/Demo_ItemBox/Demo_ItemBox.list index d22ce13005..3fcc1ab37a 100644 --- a/Demos/Demo_ItemBox/Demo_ItemBox.list +++ b/Demos/Demo_ItemBox/Demo_ItemBox.list @@ -35,4 +35,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_PanelView/Demo_PanelView.list b/Demos/Demo_PanelView/Demo_PanelView.list index 8ec7616be9..871ebafd01 100644 --- a/Demos/Demo_PanelView/Demo_PanelView.list +++ b/Demos/Demo_PanelView/Demo_PanelView.list @@ -31,4 +31,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Picking/Demo_Picking.list b/Demos/Demo_Picking/Demo_Picking.list index 838fd409fc..db05dd039d 100644 --- a/Demos/Demo_Picking/Demo_Picking.list +++ b/Demos/Demo_Picking/Demo_Picking.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_PluginStrangeButton/Demo_PluginStrangeButton.list b/Demos/Demo_PluginStrangeButton/Demo_PluginStrangeButton.list index 838fd409fc..db05dd039d 100644 --- a/Demos/Demo_PluginStrangeButton/Demo_PluginStrangeButton.list +++ b/Demos/Demo_PluginStrangeButton/Demo_PluginStrangeButton.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Pointers/Demo_Pointers.list b/Demos/Demo_Pointers/Demo_Pointers.list index a46082e936..3fcf4e7fed 100644 --- a/Demos/Demo_Pointers/Demo_Pointers.list +++ b/Demos/Demo_Pointers/Demo_Pointers.list @@ -33,4 +33,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_RenderBox/Demo_RenderBox.list b/Demos/Demo_RenderBox/Demo_RenderBox.list index 838fd409fc..db05dd039d 100644 --- a/Demos/Demo_RenderBox/Demo_RenderBox.list +++ b/Demos/Demo_RenderBox/Demo_RenderBox.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_ScrollView/Demo_ScrollView.list b/Demos/Demo_ScrollView/Demo_ScrollView.list index 838fd409fc..db05dd039d 100644 --- a/Demos/Demo_ScrollView/Demo_ScrollView.list +++ b/Demos/Demo_ScrollView/Demo_ScrollView.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Demos/Demo_Themes/Demo_Themes.list b/Demos/Demo_Themes/Demo_Themes.list index 838fd409fc..db05dd039d 100644 --- a/Demos/Demo_Themes/Demo_Themes.list +++ b/Demos/Demo_Themes/Demo_Themes.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Scripts/ConvertVcxprojToList.exe b/Scripts/ConvertVcxprojToList.exe index 336c6a0023..d1a4bf9678 100644 Binary files a/Scripts/ConvertVcxprojToList.exe and b/Scripts/ConvertVcxprojToList.exe differ diff --git a/Scripts/ConvertVcxprojToList.py b/Scripts/ConvertVcxprojToList.py index c9b40c19a3..8acc353cff 100644 --- a/Scripts/ConvertVcxprojToList.py +++ b/Scripts/ConvertVcxprojToList.py @@ -15,8 +15,6 @@ def addSourceOrHeader(fileName): #print line - if fileName.endswith("CMakeLists.txt"): - return if fileName.endswith('.h'): headers.append(" " + fileName + "\n") else: @@ -41,18 +39,19 @@ def parseFilterFile(_node): fileName = str(_node.attributes["Include"].nodeValue) fileName = convertRelativePath(fileName) - filterName = _node.getElementsByTagName("Filter")[0].childNodes[0].nodeValue - filterName = filterName.replace("\\", "\\\\") + if (len(_node.getElementsByTagName("Filter")) != 0): + filterName = _node.getElementsByTagName("Filter")[0].childNodes[0].nodeValue + filterName = filterName.replace("\\", "\\\\") - global lastFilter - if (filterName != lastFilter): - if lastFilter != "": - # close last filter - filters.append(")\n") - filters.append("SOURCE_GROUP(\"" + filterName + "\" FILES\n") - lastFilter = filterName + global lastFilter + if (filterName != lastFilter): + if lastFilter != "": + # close last filter + filters.append(")\n") + filters.append("SOURCE_GROUP(\"" + filterName + "\" FILES\n") + lastFilter = filterName - filters.append(" " + fileName + "\n") + filters.append(" " + fileName + "\n") def createFilesList(fileName, listName): @@ -79,7 +78,7 @@ def createFilesList(fileName, listName): for subNode in rootNode.childNodes: if subNode.localName == "ItemGroup": for subSubNode in subNode.childNodes: - if subSubNode.nodeType == subSubNode.ELEMENT_NODE and (subSubNode.localName == "ClInclude" or subSubNode.localName == "ClCompile" or subSubNode.localName == "ResourceCompile"): + if subSubNode.nodeType == subSubNode.ELEMENT_NODE and (subSubNode.localName == "ClInclude" or subSubNode.localName == "ClCompile" or subSubNode.localName == "ResourceCompile" or subSubNode.localName == "CustomBuild"): parseFilterFile(subSubNode) filters.append(")\n") diff --git a/Tools/FontViewer/FontViewer.list b/Tools/FontViewer/FontViewer.list index 0d29123725..f7bcc578fc 100644 --- a/Tools/FontViewer/FontViewer.list +++ b/Tools/FontViewer/FontViewer.list @@ -29,4 +29,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Tools/ImageEditor/ImageEditor.list b/Tools/ImageEditor/ImageEditor.list index bea553ac22..a02060ba4d 100644 --- a/Tools/ImageEditor/ImageEditor.list +++ b/Tools/ImageEditor/ImageEditor.list @@ -471,4 +471,5 @@ SOURCE_GROUP("Utility" FILES ) SOURCE_GROUP("Resources" FILES ImageEditor.rc + CMakeLists.txt ) diff --git a/Tools/ImageSetViewer/ImageSetViewer.list b/Tools/ImageSetViewer/ImageSetViewer.list index 11e332a4ab..a48844d8d7 100644 --- a/Tools/ImageSetViewer/ImageSetViewer.list +++ b/Tools/ImageSetViewer/ImageSetViewer.list @@ -21,4 +21,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resource" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/Tools/LayoutEditor/LayoutEditor.list b/Tools/LayoutEditor/LayoutEditor.list index 2244e8cfe5..73a7719463 100644 --- a/Tools/LayoutEditor/LayoutEditor.list +++ b/Tools/LayoutEditor/LayoutEditor.list @@ -337,4 +337,5 @@ SOURCE_GROUP("CodeGenerator" FILES ) SOURCE_GROUP("Resources" FILES LayoutEditor.rc + CMakeLists.txt ) diff --git a/Tools/SkinEditor/SkinEditor.list b/Tools/SkinEditor/SkinEditor.list index fcb30ef34d..6009033f2a 100644 --- a/Tools/SkinEditor/SkinEditor.list +++ b/Tools/SkinEditor/SkinEditor.list @@ -327,4 +327,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES SkinEditor.rc + CMakeLists.txt ) diff --git a/UnitTests/TestApp/TestApp.list b/UnitTests/TestApp/TestApp.list index f7e4874534..be16153343 100644 --- a/UnitTests/TestApp/TestApp.list +++ b/UnitTests/TestApp/TestApp.list @@ -67,14 +67,15 @@ SOURCE_GROUP("Header Files" FILES DataPropertyInfo.h DataInfoManager.h DataManager.h + pugiconfig.hpp + pugixml.hpp Action.h ActionCreateData.h ActionDestroyData.h ActionManager.h DataListUI.h - pugiconfig.hpp - pugixml.hpp ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_AttachDetach/UnitTest_AttachDetach.list b/UnitTests/UnitTest_AttachDetach/UnitTest_AttachDetach.list index 838fd409fc..db05dd039d 100644 --- a/UnitTests/UnitTest_AttachDetach/UnitTest_AttachDetach.list +++ b/UnitTests/UnitTest_AttachDetach/UnitTest_AttachDetach.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_ChildAttach/UnitTest_ChildAttach.list b/UnitTests/UnitTest_ChildAttach/UnitTest_ChildAttach.list index 838fd409fc..db05dd039d 100644 --- a/UnitTests/UnitTest_ChildAttach/UnitTest_ChildAttach.list +++ b/UnitTests/UnitTest_ChildAttach/UnitTest_ChildAttach.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_Delegates/UnitTest_Delegates.list b/UnitTests/UnitTest_Delegates/UnitTest_Delegates.list index 73c770aac8..341fdc77f6 100644 --- a/UnitTests/UnitTest_Delegates/UnitTest_Delegates.list +++ b/UnitTests/UnitTest_Delegates/UnitTest_Delegates.list @@ -17,4 +17,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_GraphView/UnitTest_GraphView.list b/UnitTests/UnitTest_GraphView/UnitTest_GraphView.list index 77268d6b71..7d8d869719 100644 --- a/UnitTests/UnitTest_GraphView/UnitTest_GraphView.list +++ b/UnitTests/UnitTest_GraphView/UnitTest_GraphView.list @@ -105,4 +105,5 @@ SOURCE_GROUP("OpenSaveFileDialog" FILES ) SOURCE_GROUP("Demo\\Resource" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_ItemBox_Info/UnitTest_ItemBox_Info.list b/UnitTests/UnitTest_ItemBox_Info/UnitTest_ItemBox_Info.list index 838fd409fc..db05dd039d 100644 --- a/UnitTests/UnitTest_ItemBox_Info/UnitTest_ItemBox_Info.list +++ b/UnitTests/UnitTest_ItemBox_Info/UnitTest_ItemBox_Info.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_Layers/UnitTest_Layers.list b/UnitTests/UnitTest_Layers/UnitTest_Layers.list index f567e56db3..72a2b49fe3 100644 --- a/UnitTests/UnitTest_Layers/UnitTest_Layers.list +++ b/UnitTests/UnitTest_Layers/UnitTest_Layers.list @@ -47,4 +47,5 @@ SOURCE_GROUP("Header Files\\Layer" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_MultiList/UnitTest_MultiList.list b/UnitTests/UnitTest_MultiList/UnitTest_MultiList.list index 278eaeba23..5a153d278c 100644 --- a/UnitTests/UnitTest_MultiList/UnitTest_MultiList.list +++ b/UnitTests/UnitTest_MultiList/UnitTest_MultiList.list @@ -25,4 +25,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_RTTLayer/UnitTest_RTTLayer.list b/UnitTests/UnitTest_RTTLayer/UnitTest_RTTLayer.list index 6f277d0f06..891b410e36 100644 --- a/UnitTests/UnitTest_RTTLayer/UnitTest_RTTLayer.list +++ b/UnitTests/UnitTest_RTTLayer/UnitTest_RTTLayer.list @@ -21,4 +21,5 @@ SOURCE_GROUP("Header Files\\Layer" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_RotatingSkin/UnitTest_RotatingSkin.list b/UnitTests/UnitTest_RotatingSkin/UnitTest_RotatingSkin.list index 838fd409fc..db05dd039d 100644 --- a/UnitTests/UnitTest_RotatingSkin/UnitTest_RotatingSkin.list +++ b/UnitTests/UnitTest_RotatingSkin/UnitTest_RotatingSkin.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_Spline/UnitTest_Spline.list b/UnitTests/UnitTest_Spline/UnitTest_Spline.list index 838fd409fc..db05dd039d 100644 --- a/UnitTests/UnitTest_Spline/UnitTest_Spline.list +++ b/UnitTests/UnitTest_Spline/UnitTest_Spline.list @@ -13,4 +13,5 @@ SOURCE_GROUP("Header Files" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_TextureAnimations/UnitTest_TextureAnimations.list b/UnitTests/UnitTest_TextureAnimations/UnitTest_TextureAnimations.list index db5a477795..fc12fd628f 100644 --- a/UnitTests/UnitTest_TextureAnimations/UnitTest_TextureAnimations.list +++ b/UnitTests/UnitTest_TextureAnimations/UnitTest_TextureAnimations.list @@ -39,4 +39,5 @@ SOURCE_GROUP("Header Files\\Layer" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt ) diff --git a/UnitTests/UnitTest_TreeControl/UnitTest_TreeControl.list b/UnitTests/UnitTest_TreeControl/UnitTest_TreeControl.list index 13e6cceb10..21d1b259ed 100644 --- a/UnitTests/UnitTest_TreeControl/UnitTest_TreeControl.list +++ b/UnitTests/UnitTest_TreeControl/UnitTest_TreeControl.list @@ -27,4 +27,5 @@ SOURCE_GROUP("Header Files\\TreeControl" FILES ) SOURCE_GROUP("Resources" FILES ../../Common/Base/BaseResource.rc + CMakeLists.txt )