[oce] 03/04: Fix find_package(oce)

Denis Barbier barbier-guest at alioth.debian.org
Wed Aug 7 21:53:52 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 d09ecb1062ee97a3eedbcfbb963ee14e323ff7a6
Author: Denis Barbier <bouzim at gmail.com>
Date:   Wed Aug 7 23:03:34 2013 +0200

    Fix find_package(oce)
    
    Load 'visualization' targets before 'ocaf' ones.  This
    command currently spits out with this message:
      The following imported targets are referenced, but are missing:
         TKV3d TKService TKV2d
    
    Thanks to Anton Gladky for the report.
---
 debian/patches/split-export.patch |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 194ba9c..2487a0b 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -2,7 +2,7 @@ Description: Split export file into several pieces
 Author: Denis Barbier <bouzim at gmail.com>
 Origin: Debian
 Forwarded: no
-Last-Update: 2012-08-02
+Last-Update: 2013-08-07
 
 In Debian, OCE libraries are split into several packages.
 Prior to oce 0.10-3, the OCE-libraries-release.cmake file contained all
@@ -42,8 +42,8 @@ Index: oce/CMakeLists.txt
 +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_Ocaf "TKCAF;TKBin;TKXml;TKPCAF;TKBinTObj;TKXmlTObj;TKStdSchema;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP")
-+DEBIAN_DECLARE_EXPORT_TARGETS(05_Visualization "TKService;TKV2d;TKV3d;TKOpenGl;TKMeshVS;TKNIS;TKVRML;TKVoxel")
++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)
@@ -57,8 +57,8 @@ Index: oce/CMakeLists.txt
 +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_OcafTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
-+INSTALL(EXPORT ${PROJECT_NAME}05_VisualizationTargets 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)
  
  IF(${PROJECT_NAME}_USE_BUNDLE_SOURCE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH)

-- 
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