Skip to content

Commit

Permalink
Modified user files for VS releases to contain a valid debug start op…
Browse files Browse the repository at this point in the history 
…tion
  • Loading branch information
@hkbinaurics
hkbinaurics committed Mar 15, 2024
1 parent f085b61 commit c5a047d
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 5 deletions.
12 changes: 11 additions & 1 deletion cmake/common_local_exe_foot.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,12 @@ if(JVX_PREPARE_QT_WORKSPACE_VS)
"${CMAKE_GENERATOR}" MATCHES "Visual Studio 11 2012 Win64" OR
"${CMAKE_GENERATOR}" MATCHES "Visual Studio 15 2017 Win64")
file(TO_NATIVE_PATH "${JVX_REPLACE_ME}" JVX_REPLACE_ME)
# message("->JVX_REPLACE_ME_COMMAND_ARGS= ${JVX_REPLACE_ME_COMMAND_ARGS}")
set(JVX_REPLACE_ME_QT_PATH ${QT_INSTALL_PATH})
set(JVX_REPLACE_ME_COMMAND_ARGS "-platformpluginpath ${JVX_REPLACE_ME_QT_PATH}/plugins/platforms -platformpluginpath ${JVX_REPLACE_ME_QT_PATH}/plugins --jvxdir jvxComponents --config $(TargetName)${JVX_REPLACE_ME_CONFIG_EXT}.jvx --textlog --verbose_dll --textloglev 10")
if(JVX_REPLACE_ME_COMMAND_ARGS_VS)
set(JVX_REPLACE_ME_COMMAND_ARGS ${JVX_REPLACE_ME_COMMAND_ARGS_VS})
endif()
if(JVX_HOST_WITH_NO_ARGS)
configure_file(${JVX_VS_TPL_PATH}/theProject.vcxproj.qt.user.direct.in ${CMAKE_CURRENT_BINARY_DIR}/${JVX_TARGET_NAME}.vcxproj.user)
else()
Expand All @@ -303,7 +308,12 @@ if(JVX_PREPARE_WORKSPACE_VS)
"${CMAKE_GENERATOR}" MATCHES "Visual Studio 11 2012 Win64" OR
"${CMAKE_GENERATOR}" MATCHES "Visual Studio 15 2017 Win64")
file(TO_NATIVE_PATH "${JVX_REPLACE_ME}" JVX_REPLACE_ME)
set(JVX_REPLACE_ME_QT_PATH ${QT_INSTALL_PATH})
set(JVX_REPLACE_ME_QT_PATH ${QT_INSTALL_PATH})
set(JVX_REPLACE_ME_COMMAND_ARGS "--jvxdir jvxComponents --config $(TargetName)${JVX_REPLACE_ME_CONFIG_EXT}.jvx --textlog --verbose_dll --textloglev 10")
if(JVX_REPLACE_ME_COMMAND_ARGS_VS)
set(JVX_REPLACE_ME_COMMAND_ARGS ${JVX_REPLACE_ME_COMMAND_ARGS_VS})
endif()
# message("->JVX_REPLACE_ME_COMMAND_ARGS= ${JVX_REPLACE_ME_COMMAND_ARGS}")
configure_file(${JVX_VS_TPL_PATH}/theProject.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${JVX_TARGET_NAME}.vcxproj.user)
endif()
endif()
Expand Down
21 changes: 19 additions & 2 deletions misc/visualstudio/vs2015/theProject.vcxproj.qt.user.in
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerCommandArguments>-platformpluginpath @JVX_REPLACE_ME_QT_PATH@/plugins/platforms -platformpluginpath @JVX_REPLACE_ME_QT_PATH@/plugins --jvxdir jvxComponents --config $(TargetName)@[email protected] --textlog --verbose_dll --textloglev 10</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin/x64;%GLEW_LIBRARY_PATH%/bin/Release/x64;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin/x64;%GLEW_LIBRARY_PATH%/bin/Release/x64;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>-platformpluginpath @JVX_REPLACE_ME_QT_PATH@/plugins/platforms -platformpluginpath @JVX_REPLACE_ME_QT_PATH@/plugins --jvxdir jvxComponents --config $(TargetName)@[email protected] --textlog --verbose_dll --textloglev 10</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin;%GLEW_LIBRARY_PATH%/bin/Release/Win32;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin;%GLEW_LIBRARY_PATH%/bin/Release/Win32;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>

</Project>
20 changes: 18 additions & 2 deletions misc/visualstudio/vs2015/theProject.vcxproj.user.in
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerCommandArguments>--jvxdir jvxComponents --config $(TargetName)@[email protected] --textlog --verbose_dll --textloglev 10</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin/x64;%GLEW_LIBRARY_PATH%/bin/Release/x64;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin/x64;%GLEW_LIBRARY_PATH%/bin/Release/x64;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>--config $(TargetName)@[email protected] --textlog --verbose_dll --textloglev 10</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
<LocalDebuggerWorkingDirectory>@JVX_REPLACE_ME@</LocalDebuggerWorkingDirectory>
<LocalDebuggerEnvironment>PATH=@JVX_REPLACE_ME@\bin;%GLUT_LIBRARY_PATH%/bin;%GLEW_LIBRARY_PATH%/bin/Release/Win32;%OPENCV_LIBRARY_PATH%/bin;%PATH%</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerCommandArguments>@JVX_REPLACE_ME_COMMAND_ARGS@</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommand_old>@JVX_REPLACE_ME@\bin\$(TargetName).exe</LocalDebuggerCommand_old>
Expand Down

0 comments on commit c5a047d

Please sign in to comment.