OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0026880: Configuration, CMake - platform dependent code is not generated

Browse Source 
several misprints fixed (upper case, sorting of empty list, empty parent directory)

CMake should consider CSF_ variables from EXTERNLIB file for each toolkit

CSF_ variables are defined in occt_csf for each OS
redundant CSF removed

Conflicts:
src/TKG3d/CMakeLists.txt
This commit is contained in:
ibs 2015-11-12 15:28:34 +03:00 committed by bugmaster
parent d3ff0ff227
commit fb3267c7b8
64 changed files with 256 additions and 840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -133,7 +133,7 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")
list (FIND BUILD_TOOLKITS TKMath CAN_REBUILD_PDC_FOR_TKMATH) list (FIND BUILD_TOOLKITS TKMath CAN_REBUILD_PDC_FOR_TKMATH)
list (FIND BUILD_TOOLKITS StepFile CAN_REBUILD_PDC_FOR_STEPFILE) list (FIND BUILD_TOOLKITS StepFile CAN_REBUILD_PDC_FOR_STEPFILE)
if (NOT "${CAN_REBUILD_PDC_FOR_TKMATH}" STREQUAL "-1" OR NOT "${CAN_REBUILD_PDC_FOR_STEPFILE}" STREQUAL "-1") if (NOT ${CAN_REBUILD_PDC_FOR_TKMATH} EQUAL -1 OR NOT ${CAN_REBUILD_PDC_FOR_STEPFILE} EQUAL -1)
set (REBUILD_PLATFORM_DEPENDENT_CODE OFF CACHE BOOL "${REBUILD_PLATFORM_DEPENDENT_CODE_DESCR}") set (REBUILD_PLATFORM_DEPENDENT_CODE OFF CACHE BOOL "${REBUILD_PLATFORM_DEPENDENT_CODE_DESCR}")
else() else()
OCCT_CHECK_AND_UNSET (REBUILD_PLATFORM_DEPENDENT_CODE) OCCT_CHECK_AND_UNSET (REBUILD_PLATFORM_DEPENDENT_CODE)
@ -157,7 +157,7 @@ endif()
# search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit # search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL) OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
if ("${USE_TCL}" STREQUAL ON) if (USE_TCL)
message (STATUS "Info: TCL is used by OCCT") message (STATUS "Info: TCL is used by OCCT")
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
@ -174,7 +174,7 @@ endif()
# search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE) OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
if ("${USE_FREETYPE}" STREQUAL ON) if (USE_FREETYPE)
message (STATUS "Info: Freetype is used by OCCT") message (STATUS "Info: Freetype is used by OCCT")
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
else() else()
@ -239,7 +239,6 @@ endif()
OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS) OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS)
if (NOT DEFINED ANDROID AND CAN_USE_GL2PS) if (NOT DEFINED ANDROID AND CAN_USE_GL2PS)
message(STATUS "USE_GL2PS = $ENV{USE_GL2PS} or ${USE_GL2PS}")
set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}") set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}")
if (USE_GL2PS) if (USE_GL2PS)
@ -477,6 +476,9 @@ foreach(RESOURCE ${RESOURCES})
endif() endif()
endforeach() endforeach()
# define CSF variable
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
# include patched toolkit projects or original ones # include patched toolkit projects or original ones
foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS}) foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}") OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")

2
adm/cmake/bison.cmake
View File

@ -9,7 +9,7 @@ endif()
# BISON_EXECUTABLE is required by BISON_TARGET macro and should be defined # BISON_EXECUTABLE is required by BISON_TARGET macro and should be defined
set (BISON_EXECUTABLE "${3RDPARTY_BISON_EXECUTABLE}" CACHE FILEPATH "path to the bison executable" FORCE) set (BISON_EXECUTABLE "${3RDPARTY_BISON_EXECUTABLE}" CACHE FILEPATH "path to the bison executable" FORCE)
find_package (Bison) find_package (BISON)
if (BISON_FOUND) if (BISON_FOUND)
set (3RDPARTY_BISON_EXECUTABLE "${BISON_EXECUTABLE}" CACHE FILEPATH "The Path to the bison command" FORCE) set (3RDPARTY_BISON_EXECUTABLE "${BISON_EXECUTABLE}" CACHE FILEPATH "The Path to the bison command" FORCE)

106
adm/cmake/occt_csf.cmake Normal file
View File

@ -0,0 +1,106 @@
# CSF variables definition
if (NOT DEFINED USE_TCL)
OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
endif()
if (USE_TCL)
if ("${3RDPARTY_TCL_LIBRARY_VERSION}" STREQUAL "")
message (WARNING "TCL version has not been specified by CSF_TclLibs defining")
message (WARNING "thus it will be used as 8.6")
set (3RDPARTY_TCL_LIBRARY_VERSION "8.6")
endif()
if ("${3RDPARTY_TK_LIBRARY_VERSION}" STREQUAL "")
message (WARNING "TK version has not been specified by CSF_TclTkLibs defining")
message (WARNING "thus it will be used as 8.6")
set (3RDPARTY_TK_LIBRARY_VERSION "8.6")
endif()
endif()
if (USE_VTK AND NOT VTK_LIBRARY_NAMES)
message (WARNING "CSF_VTK specification: VTK libraries are not defined")
endif()
if (USE_TBB)
set (CSF_TBB "tbb tbbmalloc")
else()
set (CSF_TBB)
endif()
if (WIN32)
set (CSF_advapi32 "advapi32.lib")
set (CSF_gdi32 "gdi32.lib")
set (CSF_user32 "user32.lib")
set (CSF_wsock32 "wsock32.lib")
set (CSF_AviLibs "ws2_32.lib vfw32.lib")
set (CSF_OpenGlLibs "opengl32.lib glu32.lib")
if (USE_TCL)
set (CSF_TclLibs "tcl${3RDPARTY_TCL_LIBRARY_VERSION}.lib")
set (CSF_TclTkLibs "tk${3RDPARTY_TK_LIBRARY_VERSION}.lib")
endif()
if (USE_VTK)
set (CSF_VTK "${VTK_LIBRARY_NAMES}")
else()
set (CSF_VTK)
endif()
else()
#-- Tcl/Tk configuration
if (USE_TCL)
set (CSF_TclLibs "tcl${3RDPARTY_TCL_LIBRARY_VERSION}")
set (CSF_TclTkLibs "X11 tk${3RDPARTY_TK_LIBRARY_VERSION}")
endif()
if(APPLE)
set (CSF_objc "objc")
# frameworks
set (CSF_Appkit "Appkit")
set (CSF_IOKit "IOKit")
set (CSF_OpenGlLibs "OpenGL")
set (CSF_TclLibs "Tcl")
set (CSF_TclTkLibs "Tk")
elseif(ANDROID)
set (CSF_ThreadLibs "c")
set (CSF_OpenGlLibs "EGL GLESv2")
elseif (UNIX)
set (CSF_ThreadLibs "pthread rt")
set (CSF_OpenGlLibs "GLU GL")
endif()
if (NOT DEFINED ANDROID)
set (CSF_XwLibs "X11 Xext Xmu Xi")
set (CSF_MotifLibs "X11")
endif()
if (USE_FREETYPE)
set (CSF_FREETYPE "freetype")
else()
set (CSF_FREETYPE)
endif()
if (USE_FREEIMAGE)
set (CSF_FreeImagePlus "freeimage")
else()
set (CSF_FreeImagePlus)
endif()
if (NOT DEFINED ANDROID)
if (USE_GL2PS)
set (CSF_GL2PS "gl2ps")
else()
set (CSF_GL2PS)
endif()
endif()
if (USE_VTK)
set (CSF_VTK "${VTK_LIBRARY_NAMES}")
else()
set (CSF_VTK)
endif()
endif()

88
adm/cmake/occt_toolkit.cmake
View File

@ -1,11 +1,25 @@
# script for each OCCT toolkit # script for each OCCT toolkit
# parce PACKAGES file
if ("${PROJECT_NAME}" STREQUAL DRAWEXE)
set (USED_PACKAGES DRAWEXE)
else()
FILE_TO_LIST ("src/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
endif()
set (PRECOMPILED_DEFS)
# Get all used packages from toolkit # Get all used packages from toolkit
foreach (OCCT_PACKAGE ${TOOLKIT_MODULES}) foreach (OCCT_PACKAGE ${USED_PACKAGES})
# TKService contains platform-dependent packages: Xw and WNT
if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
continue()
endif()
if (WIN32) if (WIN32)
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL") list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
endif() endif()
# ${OCCT_SOURCE_DIR}/src/${OCCT_PACKAGE}
set (SOURCE_FILES) set (SOURCE_FILES)
set (HEADER_FILES) set (HEADER_FILES)
@ -16,15 +30,16 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
# flex files # flex files
OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX) OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN) list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
list (SORT SOURCE_FILES_FLEX)
# bison files # bison files
OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON) OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN) list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
list (SORT SOURCE_FILES_BISON)
if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0) if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
list (SORT SOURCE_FILES_FLEX)
list (SORT SOURCE_FILES_BISON)
math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1") math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN}) foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
@ -39,8 +54,8 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL}) if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c) set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c) set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMP_DIR}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}") BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
FLEX_TARGET (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMP_DIR}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}") FLEX_TARGET (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME}) ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE}) list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
@ -100,26 +115,6 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
endforeach() endforeach()
string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}") string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
# Get from toolkits EXTERNLIB all used libs
OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
if ("${FOUND_TOOLKIT}" STREQUAL "ON")
list (APPEND USED_LIBS "${PROJECT_DEP}")
endif()
endforeach()
# Create project for toolkit
list (FIND BUILD_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
if ("${BUILD_TOOLKITS}" STREQUAL "" OR NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
foreach (OCCT_MODULE ${OCCT_MODULES})
list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
set (CURRENT_MODULE ${OCCT_MODULE})
endif()
endforeach()
if ("${PROJECT_NAME}" STREQUAL "DRAWEXE") if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES}) add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
@ -157,7 +152,42 @@ if ("${BUILD_TOOLKITS}" STREQUAL "" OR NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
endif() endif()
endif() endif()
set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}") set (CURRENT_MODULE)
set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}") foreach (OCCT_MODULE ${OCCT_MODULES})
target_link_libraries (${PROJECT_NAME} ${USED_LIBS}) list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
set (CURRENT_MODULE ${OCCT_MODULE})
endif() endif()
endforeach()
if (CURRENT_MODULE)
set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
endif()
set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
set (USED_TOOLKITS_BY_CURRENT_PROJECT)
set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
# parce EXTERNLIB file
FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
if (NOT "${TK_FOUND}" STREQUAL "")
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
else()
string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
if ("${CSF_FOUND}" STREQUAL "")
message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
else() # get CSF_ value
set (CURRENT_CSF ${${USED_ITEM}})
if (NOT "${CURRENT_CSF}" STREQUAL "")
# prepare a list from a string with whitespaces
separate_arguments (CURRENT_CSF)
list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
endif()
endif()
endif()
endforeach()
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})

88
adm/cmake/vtk.cmake
View File

@ -66,43 +66,57 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
endif() endif()
# vtk libraries # vtk libraries
# lib set (VTK_LIB_EXTENSION so.1)
set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.lib vtkCommonDataModel-${VTK_VERSION}.lib vtkCommonExecutionModel-${VTK_VERSION}.lib set (VTK_DLL_EXTENSION so.1)
vtkCommonMath-${VTK_VERSION}.lib vtkCommonTransforms-${VTK_VERSION}.lib vtkRenderingCore-${VTK_VERSION}.lib if (WIN32)
vtkRenderingOpenGL-${VTK_VERSION}.lib vtkFiltersGeneral-${VTK_VERSION}.lib vtkIOCore-${VTK_VERSION}.lib set (VTK_LIB_EXTENSION lib)
vtkIOImage-${VTK_VERSION}.lib vtkImagingCore-${VTK_VERSION}.lib vtkInteractionStyle-${VTK_VERSION}.lib ) set (VTK_DLL_EXTENSION dll)
endif()
set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkCommonDataModel-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkCommonExecutionModel-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkCommonMath-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkCommonTransforms-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkRenderingCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkRenderingOpenGL-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkFiltersGeneral-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkIOCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkIOImage-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkImagingCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
vtkInteractionStyle-${VTK_VERSION}.${VTK_LIB_EXTENSION})
#dll #dll
set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.dll set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonCore-${VTK_VERSION}.dll vtkCommonCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonDataModel-${VTK_VERSION}.dll vtkCommonDataModel-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonExecutionModel-${VTK_VERSION}.dll vtkCommonExecutionModel-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonMath-${VTK_VERSION}.dll vtkCommonMath-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonMisc-${VTK_VERSION}.dll vtkCommonMisc-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonSystem-${VTK_VERSION}.dll vtkCommonSystem-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkCommonTransforms-${VTK_VERSION}.dll vtkCommonTransforms-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkDICOMParser-${VTK_VERSION}.dll vtkDICOMParser-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersCore-${VTK_VERSION}.dll vtkFiltersCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersExtraction-${VTK_VERSION}.dll vtkFiltersExtraction-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersGeneral-${VTK_VERSION}.dll vtkFiltersGeneral-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersGeometry-${VTK_VERSION}.dll vtkFiltersGeometry-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersSources-${VTK_VERSION}.dll vtkFiltersSources-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkFiltersStatistics-${VTK_VERSION}.dll vtkFiltersStatistics-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkIOCore-${VTK_VERSION}.dll vtkIOCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkIOImage-${VTK_VERSION}.dll vtkIOImage-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkImagingCore-${VTK_VERSION}.dll vtkImagingCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkImagingFourier-${VTK_VERSION}.dll vtkImagingFourier-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkImagingHybrid-${VTK_VERSION}.dll vtkImagingHybrid-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkInteractionStyle-${VTK_VERSION}.dll vtkInteractionStyle-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkRenderingCore-${VTK_VERSION}.dll vtkRenderingCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkRenderingOpenGL-${VTK_VERSION}.dll vtkRenderingOpenGL-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkalglib-${VTK_VERSION}.dll vtkalglib-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkjpeg-${VTK_VERSION}.dll vtkjpeg-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkmetaio-${VTK_VERSION}.dll vtkmetaio-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkpng-${VTK_VERSION}.dll vtkpng-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtksys-${VTK_VERSION}.dll vtksys-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtktiff-${VTK_VERSION}.dll vtktiff-${VTK_VERSION}.${VTK_DLL_EXTENSION}
vtkzlib-${VTK_VERSION}.dll ) vtkzlib-${VTK_VERSION}.${VTK_DLL_EXTENSION} )
# search for dll directory # search for dll directory
if (WIN32) if (WIN32)
@ -130,12 +144,15 @@ endif()
if (INSTALL_VTK) if (INSTALL_VTK)
OCCT_MAKE_OS_WITH_BITNESS() OCCT_MAKE_OS_WITH_BITNESS()
OCCT_MAKE_COMPILER_SHORT_NAME() OCCT_MAKE_COMPILER_SHORT_NAME()
if (WIN32) if (WIN32)
if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}") if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}")
set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll") set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
foreach(VTK_DLL_NAME ${VTK_DLL_NAMES}) foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE) set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE)
find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH) find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH)
if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}") if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}")
list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}") list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}")
else() else()
@ -154,7 +171,6 @@ if (INSTALL_VTK)
endif() endif()
else () else ()
foreach(VTK_DLL_NAME ${VTK_DLL_NAMES}) foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
string(REPLACE ".dll" ".so.1" VTK_DLL_NAME "${VTK_DLL_NAME}")
install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}" install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
CONFIGURATIONS Release CONFIGURATIONS Release
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"

1
adm/templates/env.bat
View File

@ -22,7 +22,6 @@ set "HAVE_TBB=false"
set "HAVE_OPENCL=false" set "HAVE_OPENCL=false"
set "HAVE_FREEIMAGE=false" set "HAVE_FREEIMAGE=false"
set "HAVE_GL2PS=false" set "HAVE_GL2PS=false"
set "HAVE_OPENCL=false"
set "HAVE_VTK=false" set "HAVE_VTK=false"
set "HAVE_D3D=false" set "HAVE_D3D=false"
set "CSF_OPT_INC=" set "CSF_OPT_INC="

4
src/DRAWEXE/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(DRAWEXE) project(DRAWEXE)
set (TOOLKIT_MODULES
DRAWEXE
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

9
src/TKBO/CMakeLists.txt
View File

@ -1,12 +1,3 @@
project(TKBO) project(TKBO)
set (TOOLKIT_MODULES
IntTools
BRepAlgoAPI
BOPCol
BOPDS
BOPAlgo
BOPTools
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

11
src/TKBRep/CMakeLists.txt
View File

@ -1,14 +1,3 @@
project(TKBRep) project(TKBRep)
set (TOOLKIT_MODULES
TopoDS
TopExp
TopTools
BRep
BRepLProp
BRepAdaptor
BRepTools
BinTools
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKBin/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKBin) project(TKBin)
set (TOOLKIT_MODULES
BinDrivers
BinMDataXtd
BinMPrsStd
BinMNaming
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

9
src/TKBinL/CMakeLists.txt
View File

@ -1,12 +1,3 @@
project(TKBinL) project(TKBinL)
set (TOOLKIT_MODULES
BinMDF
BinMDataStd
BinMFunction
BinMDocStd
BinObjMgt
BinLDrivers
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKBinTObj/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKBinTObj) project(TKBinTObj)
set (TOOLKIT_MODULES
BinTObjDrivers
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

5
src/TKBinXCAF/CMakeLists.txt
View File

@ -1,8 +1,3 @@
project(TKBinXCAF) project(TKBinXCAF)
set (TOOLKIT_MODULES
BinXCAFDrivers
BinMXCAFDoc
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

10
src/TKBool/CMakeLists.txt
View File

@ -1,13 +1,3 @@
project(TKBool) project(TKBool)
set (TOOLKIT_MODULES
TopOpeBRep
TopOpeBRepDS
TopOpeBRepBuild
TopOpeBRepTool
BRepAlgo
BRepFill
BRepProj
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKCAF/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKCAF) project(TKCAF)
set (TOOLKIT_MODULES
TDataXtd
TNaming
TPrsStd
AppStd
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

8
src/TKCDF/CMakeLists.txt
View File

@ -1,11 +1,3 @@
project(TKCDF) project(TKCDF)
set (TOOLKIT_MODULES
CDM
PCDM
CDF
UTL
LDOM
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

6
src/TKD3DHost/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKD3DHost) project(TKD3DHost)
set (TOOLKIT_MODULES OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
D3DHost
)
include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)

9
src/TKDCAF/CMakeLists.txt
View File

@ -1,12 +1,3 @@
project(TKDCAF) project(TKDCAF)
set (TOOLKIT_MODULES
DDF
DDocStd
DNaming
DDataStd
DPrsStd
DrawDim
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

31
src/TKDraw/CMakeLists.txt
View File

@ -1,34 +1,3 @@
project(TKDraw) project(TKDraw)
set (TOOLKIT_MODULES
Draw
DBRep
DrawTrSurf
)
if (WIN32)
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS advapi32.lib )
list( APPEND USED_LIBS user32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_TCL NAMES Tcl)
list( APPEND USED_LIBS ${FRAMEWORKS_TCL} )
find_library(FRAMEWORKS_TK NAMES Tk)
list( APPEND USED_LIBS ${FRAMEWORKS_TK} )
list( APPEND USED_LIBS objc )
find_library(FRAMEWORKS_APPKIT NAMES Appkit)
list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
find_library(FRAMEWORKS_IOKIT NAMES IOKit)
list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
else()
list( APPEND USED_LIBS tcl8.6 )
list( APPEND USED_LIBS X11 )
list( APPEND USED_LIBS tk8.6 )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

5
src/TKFeat/CMakeLists.txt
View File

@ -1,8 +1,3 @@
project(TKFeat) project(TKFeat)
set (TOOLKIT_MODULES
LocOpe
BRepFeat
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

12
src/TKFillet/CMakeLists.txt
View File

@ -1,15 +1,3 @@
project(TKFillet) project(TKFillet)
set (TOOLKIT_MODULES
ChFiDS
ChFi2d
ChFi3d
ChFiKPart
Blend
BRepBlend
BlendFunc
BRepFilletAPI
FilletSurf
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

10
src/TKG2d/CMakeLists.txt
View File

@ -1,13 +1,3 @@
project(TKG2d) project(TKG2d)
set (TOOLKIT_MODULES
Geom2d
LProp
TColGeom2d
Adaptor2d
Geom2dLProp
Geom2dAdaptor
GProp
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

12
src/TKG3d/CMakeLists.txt
View File

@ -1,15 +1,3 @@
project(TKG3d) project(TKG3d)
set (TOOLKIT_MODULES
Geom
TColGeom
GeomAdaptor
AdvApprox
GeomLProp
Adaptor3d
LProp3d
TopAbs
GeomEvaluator
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

36
src/TKGeomAlgo/CMakeLists.txt
View File

@ -1,39 +1,3 @@
project(TKGeomAlgo) project(TKGeomAlgo)
set (TOOLKIT_MODULES
Hatch
GeomInt
IntStart
IntWalk
IntImp
IntCurveSurface
IntSurf
IntPatch
Geom2dInt
IntImpParGen
IntRes2d
IntCurve
TopTrans
Intf
ApproxInt
GccAna
GccEnt
GccInt
HatchGen
Geom2dHatch
Law
AppBlend
Plate
GeomPlate
LocalAnalysis
GeomAPI
GeomFill
Geom2dAPI
Geom2dGcc
FairCurve
NLPlate
IntPolyh
TopClass
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

25
src/TKGeomBase/CMakeLists.txt
View File

@ -1,28 +1,3 @@
project(TKGeomBase) project(TKGeomBase)
set (TOOLKIT_MODULES
ProjLib
GeomProjLib
GCPnts
CPnts
Approx
AppParCurves
FEmTool
AppCont
Extrema
IntAna
IntAna2d
GeomConvert
AdvApp2Var
GeomLib
Geom2dConvert
Hermit
BndLib
AppDef
GeomTools
GC
GCE2d
gce
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

11
src/TKHLR/CMakeLists.txt
View File

@ -1,14 +1,3 @@
project(TKHLR) project(TKHLR)
set (TOOLKIT_MODULES
HLRTopoBRep
HLRBRep
HLRAlgo
HLRAppli
Intrv
TopBas
TopCnx
Contap
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

21
src/TKIGES/CMakeLists.txt
View File

@ -1,24 +1,3 @@
project(TKIGES) project(TKIGES)
set (TOOLKIT_MODULES
IGESData
IGESFile
IGESBasic
IGESGraph
IGESGeom
IGESDimen
IGESDraw
IGESSolid
IGESDefs
IGESAppli
IGESConvGeom
IGESSelect
IGESToBRep
GeomToIGES
Geom2dToIGES
BRepToIGES
BRepToIGESBRep
IGESControl
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

16
src/TKIVtk/CMakeLists.txt
View File

@ -1,19 +1,3 @@
project(TKIVtk) project(TKIVtk)
set (TOOLKIT_MODULES
IVtk
IVtkOCC
IVtkVTK
IVtkTools
)
if (WIN32)
list( APPEND USED_LIBS ${VTK_LIBRARY_NAMES} )
else()
foreach(VTK_LIB_NAME ${VTK_LIBRARY_NAMES})
string(REPLACE ".lib" ".so.1" VTK_LIB_NAME ${VTK_LIB_NAME})
list( APPEND USED_LIBS "lib${VTK_LIB_NAME}")
endforeach()
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

13
src/TKIVtkDraw/CMakeLists.txt
View File

@ -1,16 +1,3 @@
project(TKIVtkDraw) project(TKIVtkDraw)
set (TOOLKIT_MODULES
IVtkDraw
)
if (WIN32)
list( APPEND USED_LIBS ${VTK_LIBRARY_NAMES} )
else()
foreach(VTK_LIB_NAME ${VTK_LIBRARY_NAMES})
string(REPLACE ".lib" ".so.1" VTK_LIB_NAME ${VTK_LIB_NAME})
list( APPEND USED_LIBS "lib${VTK_LIB_NAME}")
endforeach()
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

8
src/TKLCAF/CMakeLists.txt
View File

@ -1,11 +1,3 @@
project(TKLCAF) project(TKLCAF)
set (TOOLKIT_MODULES
TDF
TDataStd
TFunction
TDocStd
AppStdL
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

21
src/TKMath/CMakeLists.txt
View File

@ -1,24 +1,3 @@
project(TKMath) project(TKMath)
set (TOOLKIT_MODULES
math
ElCLib
ElSLib
BSplCLib
BSplSLib
PLib
Precision
GeomAbs
Poly
CSLib
Convert
Bnd
BVH
gp
TColgp
TopLoc
Expr
ExprIntrp
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

9
src/TKMesh/CMakeLists.txt
View File

@ -1,12 +1,3 @@
project(TKMesh) project(TKMesh)
set (TOOLKIT_MODULES
BRepMesh
)
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKMeshVS/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKMeshVS) project(TKMeshVS)
set (TOOLKIT_MODULES
MeshVS
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKOffset/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKOffset) project(TKOffset)
set (TOOLKIT_MODULES
BRepOffsetAPI
Draft
BRepOffset
BiTgte
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

34
src/TKOpenGl/CMakeLists.txt
View File

@ -1,37 +1,3 @@
project(TKOpenGl) project(TKOpenGl)
set (TOOLKIT_MODULES
OpenGl
)
if (WIN32)
list( APPEND USED_LIBS opengl32.lib )
list( APPEND USED_LIBS user32.lib )
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS ws2_32.lib )
list( APPEND USED_LIBS vfw32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
if(USE_GLX)
list( APPEND USED_LIBS GL )
else()
list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
endif()
list( APPEND USED_LIBS objc )
find_library(FRAMEWORKS_APPKIT NAMES Appkit)
list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
find_library(FRAMEWORKS_IOKIT NAMES IOKit)
list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
list( APPEND USED_LIBS freetype )
else()
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS freetype )
endif()
if (NOT WIN32)
if(USE_GL2PS)
list( APPEND USED_LIBS gl2ps )
endif()
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKPrim/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKPrim) project(TKPrim)
set (TOOLKIT_MODULES
BRepPrim
BRepSweep
Sweep
BRepPrimAPI
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

21
src/TKQADraw/CMakeLists.txt
View File

@ -1,24 +1,3 @@
project(TKQADraw) project(TKQADraw)
set (TOOLKIT_MODULES
QABugs
QADNaming
QADraw
QANCollection
QANewBRepNaming
QANewDBRepNaming
QANewModTopOpe
)
if (WIN32)
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS advapi32.lib )
list( APPEND USED_LIBS user32.lib )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

22
src/TKSTEP/CMakeLists.txt
View File

@ -1,25 +1,3 @@
project(TKSTEP) project(TKSTEP)
set (TOOLKIT_MODULES
StepAP214
RWStepAP214
StepAP203
RWStepAP203
STEPConstruct
STEPEdit
GeomToStep
StepToGeom
StepToTopoDS
TopoDSToStep
STEPControl
STEPSelections
StepAP209
StepAP242
RWStepAP242
)
if (WIN32)
list( APPEND USED_LIBS wsock32.lib )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKSTEP209/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKSTEP209) project(TKSTEP209)
set (TOOLKIT_MODULES
StepElement
StepFEA
RWStepElement
RWStepFEA
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKSTEPAttr/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKSTEPAttr) project(TKSTEPAttr)
set (TOOLKIT_MODULES
StepVisual
RWStepVisual
StepDimTol
RWStepDimTol
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

11
src/TKSTEPBase/CMakeLists.txt
View File

@ -1,14 +1,3 @@
project(TKSTEPBase) project(TKSTEPBase)
set (TOOLKIT_MODULES
StepBasic
RWStepBasic
StepRepr
RWStepRepr
StepGeom
RWStepGeom
StepShape
RWStepShape
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKSTL/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKSTL) project(TKSTL)
set (TOOLKIT_MODULES
StlMesh
StlAPI
StlTransfer
RWStl
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

52
src/TKService/CMakeLists.txt
View File

@ -1,55 +1,3 @@
project(TKService) project(TKService)
set (TOOLKIT_MODULES
Aspect
InterfaceGraphic
SelectBasics
Image
Cocoa
TColQuantity
Font
)
if (WIN32)
list( APPEND TOOLKIT_MODULES "WNT" )
else()
list( APPEND TOOLKIT_MODULES "Xw" )
endif()
if (WIN32)
list( APPEND USED_LIBS opengl32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
if(USE_GLX)
list( APPEND USED_LIBS GL )
find_package(X11 COMPONENTS X11 Xext Xmu Xi)
list( APPEND USED_LIBS ${X11_LIBRARIES} )
list( APPEND USED_LIBS ${X11_Xi_LIB} )
list( APPEND USED_LIBS ${X11_Xmu_LIB} )
list( APPEND USED_LIBS Xext )
list( APPEND USED_LIBS Xmu )
list( APPEND USED_LIBS Xi )
else()
list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
endif()
list( APPEND USED_LIBS objc )
find_library(FRAMEWORKS_APPKIT NAMES Appkit)
list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
find_library(FRAMEWORKS_IOKIT NAMES IOKit)
list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
else()
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS X11 )
list( APPEND USED_LIBS Xext )
list( APPEND USED_LIBS Xmu )
list( APPEND USED_LIBS Xi )
endif()
if (NOT WIN32)
if(USE_FREEIMAGE)
list( APPEND USED_LIBS freeimage )
endif()
list( APPEND USED_LIBS freetype )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

17
src/TKShHealing/CMakeLists.txt
View File

@ -1,20 +1,3 @@
project(TKShHealing) project(TKShHealing)
set (TOOLKIT_MODULES
ShapeBuild
ShapeExtend
ShapeConstruct
ShapeCustom
ShapeAnalysis
ShapeFix
ShapeUpgrade
ShapeAlgo
ShapeProcess
ShapeProcessAPI
)
if (WIN32)
list( APPEND USED_LIBS wsock32.lib )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKTObj/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKTObj) project(TKTObj)
set (TOOLKIT_MODULES
TObj
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKTObjDRAW/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKTObjDRAW) project(TKTObjDRAW)
set (TOOLKIT_MODULES
TObjDRAW
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

19
src/TKTopAlgo/CMakeLists.txt
View File

@ -1,22 +1,3 @@
project(TKTopAlgo) project(TKTopAlgo)
set (TOOLKIT_MODULES
IntCurvesFace
MAT
MAT2d
Bisector
BRepMAT2d
BRepCheck
BRepBndLib
BRepExtrema
BRepClass
BRepClass3d
BRepLib
BRepGProp
BRepIntCurveSurface
BRepTopAdaptor
BRepBuilderAPI
BRepApprox
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

14
src/TKTopTest/CMakeLists.txt
View File

@ -1,17 +1,3 @@
project(TKTopTest) project(TKTopTest)
set (TOOLKIT_MODULES
TestTopOpeDraw
TestTopOpeTools
TestTopOpe
BRepTest
GeometryTest
HLRTest
MeshTest
GeomliteTest
DrawFairCurve
BOPTest
SWDRAW
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

30
src/TKV3d/CMakeLists.txt
View File

@ -1,33 +1,3 @@
project(TKV3d) project(TKV3d)
set (TOOLKIT_MODULES
V3d
Graphic3d
Select3D
Prs3d
StdPrs
SelectMgr
PrsMgr
AIS
DsgPrs
StdSelect
)
if (WIN32)
list( APPEND USED_LIBS user32.lib )
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS opengl32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
if(USE_GLX)
list( APPEND USED_LIBS GL )
else()
list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
endif()
list( APPEND USED_LIBS freetype )
else()
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS freetype )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKVRML/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKVRML) project(TKVRML)
set (TOOLKIT_MODULES
VrmlConverter
VrmlAPI
Vrml
VrmlData
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

33
src/TKViewerTest/CMakeLists.txt
View File

@ -1,36 +1,3 @@
project(TKViewerTest) project(TKViewerTest)
set (TOOLKIT_MODULES
ViewerTest
)
if (WIN32)
list( APPEND USED_LIBS user32.lib )
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS opengl32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_TCL NAMES Tcl)
list( APPEND USED_LIBS ${FRAMEWORKS_TCL} )
find_library(FRAMEWORKS_TK NAMES Tk)
list( APPEND USED_LIBS ${FRAMEWORKS_TK} )
find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
if(USE_GLX)
list( APPEND USED_LIBS GL )
else()
list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
endif()
list( APPEND USED_LIBS objc )
find_library(FRAMEWORKS_APPKIT NAMES Appkit)
list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
find_library(FRAMEWORKS_IOKIT NAMES IOKit)
list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
list( APPEND USED_LIBS freetype )
else()
list( APPEND USED_LIBS tcl8.6 )
list( APPEND USED_LIBS X11 )
list( APPEND USED_LIBS tk8.6 )
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS freetype )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKXCAF/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKXCAF) project(TKXCAF)
set (TOOLKIT_MODULES
XCAFApp
XCAFDimTolObjects
XCAFDoc
XCAFPrs
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKXDEDRAW/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKXDEDRAW) project(TKXDEDRAW)
set (TOOLKIT_MODULES
XDEDRAW
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKXDEIGES/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKXDEIGES) project(TKXDEIGES)
set (TOOLKIT_MODULES
IGESCAFControl
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKXDESTEP/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKXDESTEP) project(TKXDESTEP)
set (TOOLKIT_MODULES
STEPCAFControl
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKXMesh/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKXMesh) project(TKXMesh)
set (TOOLKIT_MODULES
XBRepMesh
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

19
src/TKXSBase/CMakeLists.txt
View File

@ -1,22 +1,3 @@
project(TKXSBase) project(TKXSBase)
set (TOOLKIT_MODULES
Interface
Transfer
IFGraph
IFSelect
TransferBRep
XSControl
StepData
StepFile
HeaderSection
RWHeaderSection
APIHeaderSection
StepSelect
UnitsMethods
XSAlgo
LibCtl
MoniTool
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKXSDRAW/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKXSDRAW) project(TKXSDRAW)
set (TOOLKIT_MODULES
XSDRAW
XSDRAWIGES
XSDRAWSTEP
XSDRAWSTLVRML
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

7
src/TKXml/CMakeLists.txt
View File

@ -1,10 +1,3 @@
project(TKXml) project(TKXml)
set (TOOLKIT_MODULES
XmlDrivers
XmlMDataXtd
XmlMNaming
XmlMPrsStd
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

9
src/TKXmlL/CMakeLists.txt
View File

@ -1,12 +1,3 @@
project(TKXmlL) project(TKXmlL)
set (TOOLKIT_MODULES
XmlLDrivers
XmlMDF
XmlMDataStd
XmlMDocStd
XmlMFunction
XmlObjMgt
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKXmlTObj/CMakeLists.txt
View File

@ -1,7 +1,3 @@
project(TKXmlTObj) project(TKXmlTObj)
set (TOOLKIT_MODULES
XmlTObjDrivers
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

5
src/TKXmlXCAF/CMakeLists.txt
View File

@ -1,8 +1,3 @@
project(TKXmlXCAF) project(TKXmlXCAF)
set (TOOLKIT_MODULES
XmlXCAFDrivers
XmlMXCAFDoc
)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

35
src/TKernel/CMakeLists.txt
View File

@ -1,38 +1,3 @@
project(TKernel) project(TKernel)
set (TOOLKIT_MODULES
FSD
MMgt
OSD
Plugin
Quantity
Resource
Standard
StdFail
Storage
TColStd
TCollection
TShort
Units
UnitsAPI
Dico
NCollection
Message
)
if (WIN32)
list( APPEND USED_LIBS advapi32.lib )
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS user32.lib )
list( APPEND USED_LIBS kernel32.lib )
elseif (NOT APPLE AND NOT ANDROID AND NOT QNX)
list( APPEND USED_LIBS pthread )
list( APPEND USED_LIBS rt )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

4
src/TKernel/EXTERNLIB
View File

@ -1,9 +1,5 @@
CSF_SOCKETLibs
CSF_FPELibs
CSF_ThreadLibs CSF_ThreadLibs
CSF_advapi32 CSF_advapi32
CSF_gdi32 CSF_gdi32
CSF_user32 CSF_user32
CSF_kernel32
STLPortLib
CSF_TBB CSF_TBB