From 13c7b7a39540651f833c1faf83ae6fc6eed9f005 Mon Sep 17 00:00:00 2001 From: abv Date: Sat, 26 Dec 2015 18:59:36 +0300 Subject: [PATCH] 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. --- adm/cmake/occt_csf.cmake | 2 +- samples/mfc/standard/06_Ocaf/CMakeLists.txt | 2 +- src/StepFile/FILES | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake index 4b8ca5e75c..2a83eacff1 100644 --- 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 e03ae5a93a..391ae83db9 100644 --- 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 028955f57d..be6c3b536e 100755 --- 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