API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 9th, 2018
113
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.14 KB | None | 0 0
raw download clone embed print report
  1.  engine/OLGA/src/InitialState/InitialState.vcxproj   | 6 ------
  2.  engine/OLGA/src/SlbLicenseDLL/SlbLicenseDLL.vcxproj | 4 ----
  3.  engine/OLGA/src/SlbLicenseDLL/packages.config       | 2 +-
  4.  3 files changed, 1 insertion(+), 11 deletions(-)
  5.  
  6. diff --git a/engine/OLGA/src/InitialState/InitialState.vcxproj b/engine/OLGA/src/InitialState/InitialState.vcxproj
  7. index 000228354..b13dbb4a5 100644
  8. --- a/engine/OLGA/src/InitialState/InitialState.vcxproj
  9. +++ b/engine/OLGA/src/InitialState/InitialState.vcxproj
  10. @@ -126,9 +126,6 @@
  11.      <Import Project="\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets" Condition="Exists('\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets')" />
  12.      <Import Project="\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets" Condition="Exists('\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets')" />
  13.      <Import Project="\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets" Condition="Exists('\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets')" />
  14. -    <Import Project="\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets" Condition="Exists('\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets')" />
  15. -    <Import Project="\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets" Condition="Exists('\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets')" />
  16. -    <Import Project="\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets" Condition="Exists('\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets')" />
  17.    </ImportGroup>
  18.    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  19.      <PropertyGroup>
  20. @@ -138,9 +135,6 @@
  21.      <Error Condition="!Exists('\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets'))" />
  22.      <Error Condition="!Exists('\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets'))" />
  23.      <Error Condition="!Exists('\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets'))" />
  24. -    <Error Condition="!Exists('\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\hdf5.redist.1.10.1-vc140x64\build\native\hdf5.redist.targets'))" />
  25. -    <Error Condition="!Exists('\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\hdf5.1.10.1-vc140x64\build\native\hdf5.targets'))" />
  26. -    <Error Condition="!Exists('\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\Muffin.1.0.32-vc141\build\native\Muffin.targets'))" />
  27.    </Target>
  28.  </Project>
  29.  <!-- Copyright 2017 Schlumberger.  All rights reserved in Schlumberger authored and generated code (including the selection and arrangement of the source code base regardless of the authorship of individual files), but not including any copyright interest(s) owned by a third party related to source code or object code authored or generated by non-Schlumberger personnel. -->
  30. diff --git a/engine/OLGA/src/SlbLicenseDLL/SlbLicenseDLL.vcxproj b/engine/OLGA/src/SlbLicenseDLL/SlbLicenseDLL.vcxproj
  31. index 2c7834d8e..618184bcb 100644
  32. --- a/engine/OLGA/src/SlbLicenseDLL/SlbLicenseDLL.vcxproj
  33. +++ b/engine/OLGA/src/SlbLicenseDLL/SlbLicenseDLL.vcxproj
  34. @@ -196,8 +196,6 @@
  35.      <Import Project="\temp\packages\boost_slb_mscver1912.1.66.0-r0\build\native\boost_slb_mscver1912.targets" Condition="Exists('\temp\packages\boost_slb_mscver1912.1.66.0-r0\build\native\boost_slb_mscver1912.targets')" />
  36.      <Import Project="\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets" Condition="Exists('\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets')" />
  37.      <Import Project="\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets" Condition="Exists('\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets')" />
  38. -    <Import Project="\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets" Condition="Exists('\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets')" />
  39. -    <Import Project="\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets" Condition="Exists('\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets')" />
  40.    </ImportGroup>
  41.    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  42.      <PropertyGroup>
  43. @@ -208,7 +206,5 @@
  44.      <Error Condition="!Exists('\temp\packages\boost_slb_mscver1912.1.66.0-r0\build\native\boost_slb_mscver1912.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\boost_slb_mscver1912.1.66.0-r0\build\native\boost_slb_mscver1912.targets'))" />
  45.      <Error Condition="!Exists('\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets'))" />
  46.      <Error Condition="!Exists('\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets'))" />
  47. -    <Error Condition="!Exists('\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\boost_system_slb_mscver1912.1.66.0-r0\build\native\boost_system_slb_mscver1912.targets'))" />
  48. -    <Error Condition="!Exists('\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets')" Text="$([System.String]::Format('$(ErrorText)', '\temp\packages\boost_filesystem_slb_mscver1912.1.66.0-r0\build\native\boost_filesystem_slb_mscver1912.targets'))" />
  49.    </Target>
  50.  </Project>
  51. diff --git a/engine/OLGA/src/SlbLicenseDLL/packages.config b/engine/OLGA/src/SlbLicenseDLL/packages.config
  52. index 5ef1969a5..6af255e4e 100644
  53. --- a/engine/OLGA/src/SlbLicenseDLL/packages.config
  54. +++ b/engine/OLGA/src/SlbLicenseDLL/packages.config
  55. @@ -1,4 +1,4 @@
  56. -<?xml version="1.0" encoding="utf-8"?>
  57. +<?xml version="1.0" encoding="utf-8"?>
  58.  <packages>
  59.    <package id="boost_filesystem_slb_mscver1912" version="1.66.0-r0" targetFramework="native" />
  60.    <package id="boost_system_slb_mscver1912" version="1.66.0-r0" targetFramework="native" />
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!