Attachment #248765 for bug #277313

View | Details | Raw Unified | Return to bug 277313
Collapse All | Expand All

Lines 20-29 MAINTAINER = Renato Aguiar <renato@renat Link Here

(-)Makefile (-4 / +3 lines)
20	PERMIT_PACKAGE = Yes	20	PERMIT_PACKAGE = Yes
21		21
22	WANTLIB += ${COMPILER_LIBCXX} EGL GL GLEW TKBO TKBRep TKCAF TKCDF	22	WANTLIB += ${COMPILER_LIBCXX} EGL GL GLEW TKBO TKBRep TKCAF TKCDF
23	WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKLCAF TKMath	23	WANTLIB += TKDE TKDESTEP TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR
24	WANTLIB += TKMesh TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase	24	WANTLIB += TKLCAF TKMath TKMesh TKPrim TKService TKShHealing TKTopAlgo
25	WANTLIB += TKService TKShHealing TKTopAlgo TKV3d TKVCAF TKXCAF	25	WANTLIB += TKV3d TKVCAF TKXCAF TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
26	WANTLIB += TKXDE TKXDESTEP TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
27	WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt	26	WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
28	WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt	27	WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
29	WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo	28	WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo




Index: src/occt_wrapper/CMakeLists.txt
--- src/occt_wrapper/CMakeLists.txt.orig
+++ src/occt_wrapper/CMakeLists.txt
@@ -19,14 +19,12 @@ include(GenerateExportHeader)
 
 generate_export_header(OCCTWrapper)
 

+find_package(OpenCASCADE REQUIRED)
 
 set(OCCT_LIBS
-    TKXDESTEP
-    TKSTEP
-    TKSTEP209
-    TKSTEPAttr
-    TKSTEPBase
+    -L${CMAKE_INSTALL_PREFIX}/lib
+    -L/usr/X11R6/lib
+    TKDESTEP
     TKXCAF
     TKXSBase
     TKVCAF
@@ -58,5 +56,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
 
 include(GNUInstallDirs)
 

Return to bug 277313

Lines 1-7 Link Here

(-)patches/patch-src_occt_wrapper_CMakeLists_txt (-5 / +11 lines)
1	Index: src/occt_wrapper/CMakeLists.txt	1	Index: src/occt_wrapper/CMakeLists.txt
2	--- src/occt_wrapper/CMakeLists.txt.orig	2	--- src/occt_wrapper/CMakeLists.txt.orig
3	+++ src/occt_wrapper/CMakeLists.txt	3	+++ src/occt_wrapper/CMakeLists.txt
4	@@ -19,9 +19,11 @@ include(GenerateExportHeader)	4	@@ -19,14 +19,12 @@ include(GenerateExportHeader)
5		5
6	generate_export_header(OCCTWrapper)	6	generate_export_header(OCCTWrapper)
7		7
Lines 9-20 Index: src/occt_wrapper/CMakeLists.txt Link Here
9	+find_package(OpenCASCADE REQUIRED)	9	+find_package(OpenCASCADE REQUIRED)
10		10
11	set(OCCT_LIBS	11	set(OCCT_LIBS
		12	- TKXDESTEP
		13	- TKSTEP
		14	- TKSTEP209
		15	- TKSTEPAttr
		16	- TKSTEPBase
12	+ -L${CMAKE_INSTALL_PREFIX}/lib	17	+ -L${CMAKE_INSTALL_PREFIX}/lib
13	+ -L/usr/X11R6/lib	18	+ -L/usr/X11R6/lib
14	TKXDESTEP	19	+ TKDESTEP
15	TKSTEP	20	TKXCAF
16	TKSTEP209	21	TKXSBase
17	@@ -58,5 +60,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})	22	TKVCAF
		23	@@ -58,5 +56,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
18		24
19	include(GNUInstallDirs)	25	include(GNUInstallDirs)
20		26