[oce] 07/07: Update debian/patches/split-export.patch
Denis Barbier
barbier-guest at alioth.debian.org
Mon Sep 23 00:33:46 UTC 2013
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch debian
in repository oce.
commit 52e7471f9df80492e31c6c1a08c045e8d0ac154a
Author: Denis Barbier <bouzim at gmail.com>
Date: Sun Sep 22 21:44:40 2013 +0200
Update debian/patches/split-export.patch
---
debian/patches/split-export.patch | 96 ++++++++++++++++++-------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 2487a0b..19e365a 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -29,67 +29,67 @@ Index: oce/CMakeLists.txt
===================================================================
--- oce.orig/CMakeLists.txt
+++ oce/CMakeLists.txt
-@@ -1021,6 +1021,19 @@ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_D
- SET ( ${PROJECT_NAME}_WIN32_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc )
- ENDIF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
+@@ -1029,6 +1029,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
+ set ( OCE_WIN32_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc )
+ endif(NOT OCE_NO_LIBRARY_VERSION)
-+MACRO(DEBIAN_DECLARE_EXPORT_TARGETS packagename modules)
-+ FOREACH(module ${modules})
-+ SET(debianTargetExport${module} ${PROJECT_NAME}${packagename}Targets)
-+ ENDFOREACH(module ${modules})
-+ENDMACRO(DEBIAN_DECLARE_EXPORT_TARGETS packagename modules)
++macro(debian_declare_export_targets packagename modules)
++ foreach(module ${modules})
++ set(debianTargetExport${module} OCE${packagename}Targets)
++ endforeach(module ${modules})
++endmacro(debian_declare_export_targets packagename modules)
+
-+DEBIAN_DECLARE_EXPORT_TARGETS(01_Foundation "TKernel;TKMath;TKAdvTools")
-+DEBIAN_DECLARE_EXPORT_TARGETS(02_Modeling "TKG2d;TKG3d;TKGeomBase;TKBRep;TKGeomAlgo;TKTopAlgo;TKPrim;TKBO;TKHLR;TKMesh;TKShHealing;TKXMesh;TKBool;TKFillet;TKFeat;TKOffset;TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP")
-+DEBIAN_DECLARE_EXPORT_TARGETS(03_OcafLite "TKCDF;PTKernel;TKLCAF;FWOSPlugin;TKPShape;TKBinL;TKXmlL;TKPLCAF;TKTObj;TKShapeSchema;TKStdLSchema")
-+DEBIAN_DECLARE_EXPORT_TARGETS(04_Visualization "TKService;TKV2d;TKV3d;TKOpenGl;TKMeshVS;TKNIS;TKVRML;TKVoxel")
-+DEBIAN_DECLARE_EXPORT_TARGETS(05_Ocaf "TKCAF;TKBin;TKXml;TKPCAF;TKBinTObj;TKXmlTObj;TKStdSchema;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP")
-+DEBIAN_DECLARE_EXPORT_TARGETS(06_Draw "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw")
++debian_declare_export_targets(01_Foundation "TKernel;TKMath;TKAdvTools")
++debian_declare_export_targets(02_Modeling "TKG2d;TKG3d;TKGeomBase;TKBRep;TKGeomAlgo;TKTopAlgo;TKPrim;TKBO;TKHLR;TKMesh;TKShHealing;TKXMesh;TKBool;TKFillet;TKFeat;TKOffset;TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP")
++debian_declare_export_targets(03_OcafLite "TKCDF;PTKernel;TKLCAF;FWOSPlugin;TKPShape;TKBinL;TKXmlL;TKPLCAF;TKTObj;TKShapeSchema;TKStdLSchema")
++debian_declare_export_targets(04_Visualization "TKService;TKV2d;TKV3d;TKOpenGl;TKMeshVS;TKNIS;TKVRML;TKVoxel")
++debian_declare_export_targets(05_Ocaf "TKCAF;TKBin;TKXml;TKPCAF;TKBinTObj;TKXmlTObj;TKStdSchema;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP")
++debian_declare_export_targets(06_Draw "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw")
+
- MACRO(PROCESS_MODULE modulename modules_std)
+ macro(process_module modulename modules_std)
set(modules ${modules_std})
- IF(NOT ${PROJECT_NAME}_DISABLE_X11)
-@@ -1086,7 +1099,12 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_D
- INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development )
+ if(NOT OCE_DISABLE_X11)
+@@ -1098,7 +1111,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
+ install(FILES ${PROJECT_BINARY_DIR}/OCEConfig.cmake ${PROJECT_BINARY_DIR}/OCEConfigVersion.cmake
+ DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development )
--INSTALL(EXPORT ${PROJECT_NAME}-libraries DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}01_FoundationTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}02_ModelingTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}03_OcafLiteTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}04_VisualizationTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}05_OcafTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}06_DrawTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
+-install(EXPORT OCE-libraries DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE01_FoundationTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE02_ModelingTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE03_OcafLiteTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE04_VisualizationTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE05_OcafTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
++install(EXPORT OCE06_DrawTargets DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
- IF(${PROJECT_NAME}_USE_BUNDLE_SOURCE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH)
+ if(OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
# Add dependencies between OCE and oce-win-bundle
-Index: oce/ProjectConfig.cmake.in
-===================================================================
---- oce.orig/ProjectConfig.cmake.in
-+++ oce/ProjectConfig.cmake.in
-@@ -20,7 +20,11 @@ GET_FILENAME_COMPONENT(SELF_DIR "${CMAKE
- SET(@PROJECT_NAME at _INCLUDE_DIRS "${SELF_DIR}/@OCE_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR@")
- SET(@PROJECT_NAME at _LIBRARIES "@OCE_LIBRARIES@")
- SET(@PROJECT_NAME at _ALL_BUILT_MODULES "@OCE_ALL_BUILT_MODULES@")
--INCLUDE("${SELF_DIR}/@PROJECT_NAME at -libraries.cmake")
-+FILE(GLOB DEBIAN_TARGET_FILES ${SELF_DIR}/@PROJECT_NAME@*Targets.cmake)
-+LIST(SORT DEBIAN_TARGET_FILES)
-+FOREACH(file ${DEBIAN_TARGET_FILES})
-+ INCLUDE("${file}")
-+ENDFOREACH(file ${DEBIAN_TARGET_FILES})
-
- SET(@PROJECT_NAME at _ALL_FOUND true)
- IF(@PROJECT_NAME at _FIND_COMPONENTS)
Index: oce/adm/cmake/BuildToolkit.cmake
===================================================================
--- oce.orig/adm/cmake/BuildToolkit.cmake
+++ oce/adm/cmake/BuildToolkit.cmake
-@@ -265,7 +265,7 @@ ELSE(TOOLKIT_IS_PRIVATE)
- ENDIF(TOOLKIT_IS_PRIVATE)
+@@ -284,7 +284,7 @@ install(FILES ${TOOLKIT_HEADER_FILES}
+ )
- INSTALL(TARGETS ${TOOLKIT}
-- EXPORT ${PROJECT_NAME}-libraries
+ install(TARGETS ${TOOLKIT}
+- EXPORT OCE-libraries
+ EXPORT ${debianTargetExport${TOOLKIT}}
RUNTIME DESTINATION ${TOOLKIT_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT Development
+Index: oce/adm/cmake/config/ProjectConfig.cmake.in
+===================================================================
+--- oce.orig/adm/cmake/config/ProjectConfig.cmake.in
++++ oce/adm/cmake/config/ProjectConfig.cmake.in
+@@ -20,7 +20,11 @@ get_filename_component(SELF_DIR "${CMAKE
+ set(OCE_INCLUDE_DIRS "${SELF_DIR}/@OCE_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR@")
+ set(OCE_LIBRARIES "@OCE_LIBRARIES@")
+ set(OCE_ALL_BUILT_MODULES "@OCE_ALL_BUILT_MODULES@")
+-include("${SELF_DIR}/OCE-libraries.cmake")
++file(GLOB DEBIAN_TARGET_FILES ${SELF_DIR}/OCE*Targets.cmake)
++list(SORT DEBIAN_TARGET_FILES)
++foreach(file ${DEBIAN_TARGET_FILES})
++ include("${file}")
++endforeach(file ${DEBIAN_TARGET_FILES})
+
+ set(OCE_ALL_FOUND true)
+ if(OCE_FIND_COMPONENTS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git
More information about the debian-science-commits
mailing list