Configure - Fixed issue with static build of DRAWEXE #462

Replace EXTERNLIB_STATIC file with inline CMake variable definition.

diff --git a/src/Draw/DRAWEXE/CMakeLists.txt b/src/Draw/DRAWEXE/CMakeLists.txt
index c1d03299bd8b672dbb89f4757f7eef1321d3e886..8b6049b46ed7644e5549cf724a7ac86c71ea7b60 100644 (file)
--- a/src/Draw/DRAWEXE/CMakeLists.txt
+++ b/src/Draw/DRAWEXE/CMakeLists.txt
@@ -3,7 +3,8 @@ project(DRAWEXE)
 unset (CUSTOM_EXTERNLIB)
 if (NOT BUILD_SHARED_LIBS)
   # link specific list of plugins explicitly
-  FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB_STATIC" CUSTOM_EXTERNLIB)
+  include (${CMAKE_CURRENT_LIST_DIR}/EXTERNLIB_STATIC.cmake)
+  set (CUSTOM_EXTERNLIB ${OCCT_${PROJECT_NAME}_EXTERNAL_STATIC_LIBS})
   if (USE_OPENGL)
     list (REMOVE_ITEM CUSTOM_EXTERNLIB TKOpenGles)
     list (REMOVE_ITEM CUSTOM_EXTERNLIB TKOpenGlesTest)

diff --git a/src/Draw/DRAWEXE/EXTERNLIB_STATIC b/src/Draw/DRAWEXE/EXTERNLIB_STATIC
deleted file mode 100644 (file)
index 37d4950..0000000
--- a/src/Draw/DRAWEXE/EXTERNLIB_STATIC
+++ /dev/null
@@ -1,89 +0,0 @@
-TKTopTest
-TKDCAF
-TKXSDRAW
-TKXDEDRAW
-TKXSDRAWSTEP
-TKXSDRAWIGES
-TKXSDRAWGLTF
-TKXSDRAWOBJ
-TKXSDRAWPLY
-TKXSDRAWVRML
-TKXSDRAWSTL
-TKXSDRAWDE
-TKOpenGlTest
-TKOpenGlesTest
-TKViewerTest
-TKDraw
-TKMeshVS
-TKTObj
-TKBinTObj
-TKXmlTObj
-TKXSBase
-TKRWMesh
-TKDE
-TKDESTEP
-TKDEIGES
-TKDEGLTF
-TKDEOBJ
-TKDEPLY
-TKDEVRML
-TKDESTL
-TKDECascade
-TKBinXCAF
-TKXmlXCAF
-TKBin
-TKXml
-TKXmlL
-TKBinL
-TKOpenGl
-TKOpenGles
-TKXCAF
-TKVCAF
-TKStd
-TKCAF
-TKV3d
-TKHLR
-TKMesh
-TKService
-TKOffset
-TKFillet
-TKFeat
-TKBool
-TKBO
-TKShHealing
-TKPrim
-TKTopAlgo
-TKGeomAlgo
-TKBRep
-TKGeomBase
-TKG3d
-TKG2d
-TKMath
-TKStdL
-TKLCAF
-TKCDF
-TKernel
-CSF_TclTkLibs
-CSF_TclLibs
-CSF_OpenVR
-CSF_OpenGlLibs
-CSF_OpenGlesLibs
-CSF_FFmpeg
-CSF_FreeImagePlus
-CSF_FREETYPE
-CSF_Draco
-CSF_user32
-CSF_advapi32
-CSF_XwLibs
-CSF_dpsLibs
-CSF_XmuLibs
-CSF_fontconfig
-CSF_objc
-CSF_Appkit
-CSF_IOKit
-CSF_winmm
-CSF_ThreadLibs
-CSF_dl
-CSF_wsock32
-CSF_psapi
-CSF_androidlog

diff --git a/src/Draw/DRAWEXE/EXTERNLIB_STATIC.cmake b/src/Draw/DRAWEXE/EXTERNLIB_STATIC.cmake
new file mode 100644 (file)
index 0000000..af1edb0
--- /dev/null
+++ b/src/Draw/DRAWEXE/EXTERNLIB_STATIC.cmake
@@ -0,0 +1,92 @@
+# External dependencies for static DRAWEXE
+set(OCCT_DRAWEXE_EXTERNAL_STATIC_LIBS
+  TKTopTest
+  TKDCAF
+  TKXSDRAW
+  TKXDEDRAW
+  TKXSDRAWSTEP
+  TKXSDRAWIGES
+  TKXSDRAWGLTF
+  TKXSDRAWOBJ
+  TKXSDRAWPLY
+  TKXSDRAWVRML
+  TKXSDRAWSTL
+  TKXSDRAWDE
+  TKOpenGlTest
+  TKOpenGlesTest
+  TKViewerTest
+  TKDraw
+  TKMeshVS
+  TKTObj
+  TKBinTObj
+  TKXmlTObj
+  TKXSBase
+  TKRWMesh
+  TKDE
+  TKDESTEP
+  TKDEIGES
+  TKDEGLTF
+  TKDEOBJ
+  TKDEPLY
+  TKDEVRML
+  TKDESTL
+  TKDECascade
+  TKBinXCAF
+  TKXmlXCAF
+  TKBin
+  TKXml
+  TKXmlL
+  TKBinL
+  TKOpenGl
+  TKOpenGles
+  TKXCAF
+  TKVCAF
+  TKStd
+  TKCAF
+  TKV3d
+  TKHLR
+  TKMesh
+  TKService
+  TKOffset
+  TKFillet
+  TKFeat
+  TKBool
+  TKBO
+  TKShHealing
+  TKPrim
+  TKTopAlgo
+  TKGeomAlgo
+  TKBRep
+  TKGeomBase
+  TKG3d
+  TKG2d
+  TKMath
+  TKStdL
+  TKLCAF
+  TKCDF
+  TKernel
+  CSF_TclTkLibs
+  CSF_TclLibs
+  CSF_OpenVR
+  CSF_OpenGlLibs
+  CSF_OpenGlesLibs
+  CSF_FFmpeg
+  CSF_FreeImagePlus
+  CSF_FREETYPE
+  CSF_Draco
+  CSF_user32
+  CSF_advapi32
+  CSF_XwLibs
+  CSF_dpsLibs
+  CSF_XmuLibs
+  CSF_fontconfig
+  CSF_objc
+  CSF_Appkit
+  CSF_IOKit
+  CSF_winmm
+  CSF_ThreadLibs
+  CSF_dl
+  CSF_wsock32
+  CSF_psapi
+  CSF_androidlog
+)