]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
bos #33720: persalys patch
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 22 May 2023 08:01:42 +0000 (10:01 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 22 May 2023 08:01:42 +0000 (10:01 +0200)
products/patches/PERSALYS-v14.0.1-001.patch

index 80d1373c66f64cb4676baeee86a41c42af21583f..da84ed367a7fb0940b9a4ffaafa4db95ce173278 100644 (file)
@@ -33,9 +33,9 @@ diff -Naur persalys_v14.0.1_ref/cmake/FindQwt.cmake persalys_v14.0.1_dev/cmake/F
  find_library (QWT_LIBRARY
    NAMES qwt qwt-qt${QT_DEFAULT_MAJOR_VERSION}
    HINTS ${QT_LIBRARY_DIR}
-diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt
---- /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt       2023-03-31 08:59:27.000000000 +0200
-+++ /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt       2023-05-22 09:13:05.971858911 +0200
+diff -Naur persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt
+--- persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt   2023-03-31 08:59:27.000000000 +0200
++++ persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt   2023-05-22 09:13:05.971858911 +0200
 @@ -203,6 +203,7 @@
  else ()
    target_compile_definitions (persalysbase PUBLIC PERSALYS_BASE_STATIC)
@@ -55,9 +55,9 @@ diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/
  
  install (TARGETS persalysbase
    RUNTIME DESTINATION bin
-diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/plot/CMakeLists.txt /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/plot/CMakeLists.txt
---- /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/plot/CMakeLists.txt  2023-03-31 08:59:27.000000000 +0200
-+++ /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/plot/CMakeLists.txt  2023-05-20 15:45:57.000000000 +0200
+diff -Naur persalys_v14.0.1_ref/lib/src/view/plot/CMakeLists.txt persalys_v14.0.1_dev/lib/src/view/plot/CMakeLists.txt
+--- persalys_v14.0.1_ref/lib/src/view/plot/CMakeLists.txt      2023-03-31 08:59:27.000000000 +0200
++++ persalys_v14.0.1_dev/lib/src/view/plot/CMakeLists.txt      2023-05-20 15:45:57.000000000 +0200
 @@ -47,9 +47,9 @@
  if (BUILD_SHARED_LIBS)
    target_compile_definitions (persalysplot PRIVATE PERSALYS_PLOT_DLL_EXPORTS)
@@ -70,9 +70,9 @@ diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/
  if ( NOT DEFINED LIB_VERSION ) 
    set ( LIB_VERSION 0.0.0 )
  endif ()
-diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/utils/persalys/TimeLineEdit.hxx /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/utils/persalys/TimeLineEdit.hxx
---- /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/utils/persalys/TimeLineEdit.hxx      2023-03-31 08:59:27.000000000 +0200
-+++ /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/utils/persalys/TimeLineEdit.hxx      2023-05-20 14:53:23.000000000 +0200
+diff -Naur persalys_v14.0.1_ref/lib/src/view/utils/persalys/TimeLineEdit.hxx persalys_v14.0.1_dev/lib/src/view/utils/persalys/TimeLineEdit.hxx
+--- persalys_v14.0.1_ref/lib/src/view/utils/persalys/TimeLineEdit.hxx  2023-03-31 08:59:27.000000000 +0200
++++ persalys_v14.0.1_dev/lib/src/view/utils/persalys/TimeLineEdit.hxx  2023-05-20 14:53:23.000000000 +0200
 @@ -32,9 +32,9 @@
  
  public:
@@ -85,9 +85,9 @@ diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/
  
    int getSeconds() const;
    void setSeconds(const int seconds);
-diff -Naur /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/utils/TimeLineEdit.cxx /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/utils/TimeLineEdit.cxx
---- /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_ref/lib/src/view/utils/TimeLineEdit.cxx       2023-03-31 08:59:27.000000000 +0200
-+++ /export/home/catB/ng780475/PERSALYS_FINAL/1/persalys_v14.0.1_dev/lib/src/view/utils/TimeLineEdit.cxx       2023-05-20 14:53:33.000000000 +0200
+diff -Naur persalys_v14.0.1_ref/lib/src/view/utils/TimeLineEdit.cxx persalys_v14.0.1_dev/lib/src/view/utils/TimeLineEdit.cxx
+--- persalys_v14.0.1_ref/lib/src/view/utils/TimeLineEdit.cxx   2023-03-31 08:59:27.000000000 +0200
++++ persalys_v14.0.1_dev/lib/src/view/utils/TimeLineEdit.cxx   2023-05-20 14:53:33.000000000 +0200
 @@ -26,7 +26,7 @@
  namespace PERSALYS
  {