OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Configuration - Issue to start Draw debugging in VS #465

Browse Source 
Fixed path for DRAWEXE project configuration in CMakeLists.txt
Updated plugin file search path to use CSF_OCCTResourcePath
This commit is contained in:
Pasukhin Dmitry 2025-03-27 16:59:53 +00:00 committed by dpasukhi
parent fd7a989826
commit 496ffd4005
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1240,7 +1240,7 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
set (X_COMPILER_BITNESS "Win32") set (X_COMPILER_BITNESS "Win32")
endif() 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()
endif() endif()

2
adm/templates/DRAWEXE.vcxproj.user.in
View File

@ -4,6 +4,7 @@
<LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@ <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources
DRAWHOME=@CMAKE_SOURCE_DIR@/resources/DrawResources
CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples
CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests 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@'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@X_COMPILER_BITNESS@'">
<LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@ <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
DRAWHOME=@CMAKE_SOURCE_DIR@/resources/DrawResources
CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resources
CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples

4
src/Draw/TKDraw/Draw/Draw.cxx
View File

@ -452,10 +452,10 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
else else
{ {
TCollection_AsciiString aDrawHome; TCollection_AsciiString aDrawHome;
TCollection_AsciiString aCasRoot(OSD_Environment("CASROOT").Value()); TCollection_AsciiString aCasRoot(OSD_Environment("CSF_OCCTResourcePath").Value());
if (!aCasRoot.IsEmpty()) if (!aCasRoot.IsEmpty())
{ {
aDrawHome = aCasRoot + "/src/DrawResources"; aDrawHome = aCasRoot + "/DrawResources";
} }
else else
{ {

8
src/Draw/TKDraw/Draw/Draw_PloadCommands.cxx
View File

@ -60,17 +60,17 @@ static Standard_Boolean findPluginFile(TCollection_AsciiString& thePluginName,
} }
else else
{ {
// now try by CASROOT // now try by CSF_OCCTResourcePath
thePluginDir = OSD_Environment("CASROOT").Value(); thePluginDir = OSD_Environment("CSF_OCCTResourcePath").Value();
if (!thePluginDir.IsEmpty()) if (!thePluginDir.IsEmpty())
{ {
thePluginDir += "/src/DrawResources"; thePluginDir += "/DrawResources";
aToSetCSFVariable = Standard_True; // CSF variable to be set later aToSetCSFVariable = Standard_True; // CSF variable to be set later
} }
else else
{ {
Message::SendFail() << "Failed to load plugin: Neither " << aCSFVariable Message::SendFail() << "Failed to load plugin: Neither " << aCSFVariable
<< ", nor CASROOT variables have been set"; << ", nor CSF_OCCTResourcePath variables have been set";
return Standard_False; return Standard_False;
} }
} }