1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

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

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

View File

@@ -1,38 +1,3 @@
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)

View File

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