OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-06-30 12:14:08 +03:00
Code

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

Browse Source 
Header files(*.h, *.hxx, *.lxx, *.gxx) were included in Visual Studio projects.
This commit is contained in:
ski 2015-01-19 12:29:42 +03:00 committed by abv
parent 94829f8492
commit d7b60a9f30
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
adm/cmake/BuildToolkit.cmake
View File

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