Configuration - Issue to start Draw debugging in VS #465

Fixed path for DRAWEXE project configuration in CMakeLists.txt
Updated plugin file search path to use CSF_OCCTResourcePath

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b1db71f7312840674da1cc3efeeccbf2ea9ff45..5def27cf3ed9e39621727e6889c3fd3af49bc869 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1240,7 +1240,7 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
       set (X_COMPILER_BITNESS "Win32")
     endif()
 
-    OCCT_CONFIGURE ("adm/templates/DRAWEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user")
+    OCCT_CONFIGURE ("adm/templates/DRAWEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/src/Draw/DRAWEXE/DRAWEXE.vcxproj.user")
   endif()
 endif()
 

diff --git a/adm/templates/DRAWEXE.vcxproj.user.in b/adm/templates/DRAWEXE.vcxproj.user.in
index cd1545304abd2e66bd6a26b9cc49ee8f65840b96..c9b4cbd4f064561b6361ebbdac67fa8c964ad678 100644 (file)
--- a/adm/templates/DRAWEXE.vcxproj.user.in
+++ b/adm/templates/DRAWEXE.vcxproj.user.in
@@ -4,6 +4,7 @@
   <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
 CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources
+DRAWHOME=@CMAKE_SOURCE_DIR@/resources/DrawResources
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples
 CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests
@@ -29,6 +30,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@X_COMPILER_BITNESS@'">
   <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+DRAWHOME=@CMAKE_SOURCE_DIR@/resources/DrawResources
 CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples

diff --git a/src/Draw/TKDraw/Draw/Draw.cxx b/src/Draw/TKDraw/Draw/Draw.cxx
index 32160fa7076dab314bf991515740a800d91981da..184152728eeb2e600963d53d55b7919ac9c76893 100644 (file)
--- a/src/Draw/TKDraw/Draw/Draw.cxx
+++ b/src/Draw/TKDraw/Draw/Draw.cxx
@@ -452,10 +452,10 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
   else
   {
     TCollection_AsciiString aDrawHome;
-    TCollection_AsciiString aCasRoot(OSD_Environment("CASROOT").Value());
+    TCollection_AsciiString aCasRoot(OSD_Environment("CSF_OCCTResourcePath").Value());
     if (!aCasRoot.IsEmpty())
     {
-      aDrawHome = aCasRoot + "/src/DrawResources";
+      aDrawHome = aCasRoot + "/DrawResources";
     }
     else
     {

diff --git a/src/Draw/TKDraw/Draw/Draw_PloadCommands.cxx b/src/Draw/TKDraw/Draw/Draw_PloadCommands.cxx
index 45a3af069930d8190a7e2ad948e411deecea07e3..73625dadcbd791541d4137b5b2fc9f2c1c063540 100644 (file)
--- a/src/Draw/TKDraw/Draw/Draw_PloadCommands.cxx
+++ b/src/Draw/TKDraw/Draw/Draw_PloadCommands.cxx
@@ -60,17 +60,17 @@ static Standard_Boolean findPluginFile(TCollection_AsciiString& thePluginName,
     }
     else
     {
-      // now try by CASROOT
-      thePluginDir = OSD_Environment("CASROOT").Value();
+      // now try by CSF_OCCTResourcePath
+      thePluginDir = OSD_Environment("CSF_OCCTResourcePath").Value();
       if (!thePluginDir.IsEmpty())
       {
-        thePluginDir += "/src/DrawResources";
+        thePluginDir += "/DrawResources";
         aToSetCSFVariable = Standard_True; // CSF variable to be set later
       }
       else
       {
         Message::SendFail() << "Failed to load plugin: Neither " << aCSFVariable
-                            << ", nor CASROOT variables have been set";
+                            << ", nor CSF_OCCTResourcePath variables have been set";
         return Standard_False;
       }
     }