0027041: CMake - CLang 3.6.2 fails to link DRAWEXE on Ubuntu 15.10

"stdc++" is added to CSF_ThreadLibs in CMake script to make DRAWEXE built well.

In addition, TKVCAF added in CMake script for OCAF MFC sample, and Yacc and Lex files added in src/StepFile/FILES to make it consistent with actual contents of the package.

diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
index 4b8ca5e75ca547ebf6382e9b8cf765bf89ffdf75..2a83eacff12fe368d79fc864cfbb0b3074470f0a 100644 (file)
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -74,7 +74,7 @@ else()
     set (CSF_ThreadLibs  "c")
     set (CSF_OpenGlLibs  "EGL GLESv2")
   elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt")
+    set (CSF_ThreadLibs  "pthread rt stdc++")
     set (CSF_OpenGlLibs  "GLU GL")
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
 

diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
index e03ae5a93acc191185064a7bfedbdb9d33ba30f4..391ae83db90e85ee31785a9a5e3742fd30061fb4 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/CMakeLists.txt
+++ b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
@@ -66,4 +66,4 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Ocaf_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (Ocaf mfcsample TKLCAF TKBO)
\ No newline at end of file
+target_link_libraries (Ocaf mfcsample TKLCAF TKVCAF TKBO)

diff --git a/src/StepFile/FILES b/src/StepFile/FILES
index 028955f57d70680a7d7fd8c39ee0c0749e3c4920..be6c3b536e338ab20304f33d6721f747ac9dad23 100755 (executable)
--- a/src/StepFile/FILES
+++ b/src/StepFile/FILES
@@ -10,3 +10,5 @@ StepFile_Read.hxx
 StepFile_Transfer.hxx
 stepread.c
 stepread.ph
+step.lex
+step.yacc