0022827: Make non-CPP source files (CDLs, headers) to appear in MS VS project files

Header files(*.h, *.hxx, *.lxx, *.gxx) were included in Visual Studio projects.

diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index 26cb58a9606916fce57aef5957959bf49a5d4b54..b0e3d72fce1885968e3ddf309229daa6feaab943 100644 (file)
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -20,10 +20,14 @@ endforeach()
 foreach (CDIR ${COMPILER_DIRECTORIES})
   get_filename_component (CDirName ${CDIR} NAME)
   set (CDIR_files)
-  file (STRINGS "${CDIR}/FILES" FLEX_Files REGEX ".+[.]lex")
-  file (STRINGS "${CDIR}/FILES" BISON_Files REGEX ".+[.]yacc")
-  file (STRINGS "${CDIR}/FILES" CFiles REGEX ".+[.]c")
-  file (STRINGS "${CDIR}/FILES" MFiles REGEX ".+[.]mm")
+  set (HDIR_files)
+  file(STRINGS "${CDIR}/FILES" FLEX_Files REGEX ".+[.]lex")
+  file(STRINGS "${CDIR}/FILES" BISON_Files REGEX ".+[.]yacc")
+  file(STRINGS "${CDIR}/FILES" CFiles REGEX ".+[.]c")
+  file(STRINGS "${CDIR}/FILES" MFiles REGEX ".+[.]mm")
+  file(STRINGS "${CDIR}/FILES" HFiles REGEX ".+[.]h")
+  file(STRINGS "${CDIR}/FILES" LXXFiles REGEX ".+[.]lxx")
+  file(STRINGS "${CDIR}/FILES" GXXFiles REGEX ".+[.]gxx")
 
   # Generate Flex and Bison files
   if (${BUILD_BISON_FLEX_FILES})
@@ -49,21 +53,26 @@ foreach (CDIR ${COMPILER_DIRECTORIES})
     endif()
   endif()
 
-  list (APPEND CDIR_files ${CFiles})
-  if (APPLE)
-    list ( APPEND CDIR_files ${MFiles})
+  list(APPEND HDIR_files ${HFiles} ${LXXFiles} ${GXXFiles})
+  list( APPEND CDIR_files ${CFiles})
+  if(APPLE)
+    list( APPEND CDIR_files ${MFiles})
   endif()
 
-  foreach (CFile ${CDIR_files})
-    list (APPEND USED_SRCFILES ${CDIR}/${CFile} )
-    SOURCE_GROUP (${CDirName} FILES ${CDIR}/${CFile})
-  endforeach()
-endforeach()
+  foreach(HFile ${HDIR_files})
+    list( APPEND USED_INCFILES ${CDIR}/${HFile} )
+    SOURCE_GROUP ("Header Files\\${CDirName}" FILES ${CDIR}/${HFile})
+  endforeach(HFile)
 
-list (FIND USED_TOOLKITS ${PROJECT_NAME} isFOUND)
+  foreach(CFile ${CDIR_files})
+    list( APPEND USED_SRCFILES ${CDIR}/${CFile} )
+    SOURCE_GROUP ("Source Files\\${CDirName}" FILES ${CDIR}/${CFile})
+  endforeach(CFile)
+endforeach(CDIR)
 
-OCCT_MAKE_BUILD_POSTFIX()
+list( FIND USED_TOOLKITS ${PROJECT_NAME} isFOUND)
 
+OCCT_MAKE_BUILD_POSTFIX()
 # Create project for toolkit
 if ("${USED_TOOLKITS}" STREQUAL "" OR NOT ${isFOUND} EQUAL -1)
   foreach (MODULE ${OCCT_MODULES})
@@ -73,10 +82,10 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR NOT ${isFOUND} EQUAL -1)
     endif()
   endforeach()
   if (isEXE)
-    add_executable (${PROJECT_NAME} ${USED_SRCFILES})
-    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+    add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}" )
   else()
-    add_library (${PROJECT_NAME} ${USED_SRCFILES})
+    add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
     install (TARGETS ${PROJECT_NAME}
              RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}"
              ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}"