MSVC: Fix run and debug project settings (#771)
* MSVC: Fix run and debug project settings * MSVC: Fix CMake infinite loop
This commit is contained in:
parent
83a2d2af4b
commit
58788ef43a
@ -50,15 +50,16 @@ if(NOT DEFINED CMAKE_PREFIX_PATH)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_subdirectory(xs)
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
# By default the startup project in MSVC is the 'ALL_BUILD' cmake-created project,
|
# By default the startup project in MSVC is the 'ALL_BUILD' cmake-created project,
|
||||||
# but we want 'slic3r' as the startup one because debugging run command is associated with it.
|
# but we want 'slic3r' as the startup one because debugging run command is associated with it.
|
||||||
# (Unfortunatelly it cannot be associated with ALL_BUILD using CMake.)
|
# (Unfortunatelly it cannot be associated with ALL_BUILD using CMake.)
|
||||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT slic3r)
|
# Note: For some reason this needs to be set in the top-level CMakeLists.txt
|
||||||
|
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT XS)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_subdirectory(xs)
|
|
||||||
|
|
||||||
enable_testing ()
|
enable_testing ()
|
||||||
get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY)
|
get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY)
|
||||||
add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
|
add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<LocalDebuggerCommand>C:\wperl64d\bin\perl.exe</LocalDebuggerCommand>
|
|
||||||
<LocalDebuggerCommandArguments>slic3r.pl</LocalDebuggerCommandArguments>
|
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
|
||||||
<LocalDebuggerWorkingDirectory>..\..</LocalDebuggerWorkingDirectory>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
@ -8,4 +8,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup />
|
<ItemDefinitionGroup />
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<LocalDebuggerCommand>C:\wperl64d\bin\perl.exe</LocalDebuggerCommand>
|
||||||
|
<LocalDebuggerCommandArguments>slic3r.pl</LocalDebuggerCommandArguments>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
<LocalDebuggerWorkingDirectory>..\..</LocalDebuggerWorkingDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -50,7 +50,6 @@ and use these commands to build the Slic3r from the command line:
|
|||||||
cd build
|
cd build
|
||||||
cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
|
cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
|
||||||
nmake
|
nmake
|
||||||
ctest --verbose # TODO: ???
|
|
||||||
cd ..
|
cd ..
|
||||||
perl slic3r.pl
|
perl slic3r.pl
|
||||||
|
|
||||||
@ -60,27 +59,34 @@ You may also build Slic3r PE with other build tools:
|
|||||||
|
|
||||||
### Building with Visual Studio
|
### Building with Visual Studio
|
||||||
|
|
||||||
To build, lanuch and/or debug Slic3r PE with Visual Studio (64 bits), replace the `cmake` command with:
|
To build and debug Slic3r PE with Visual Studio (64 bits), replace the `cmake` command with:
|
||||||
|
|
||||||
cmake .. -G "Visual Studio 12 Win64" -DCMAKE_CONFIGURATION_TYPES=Release;RelWithDebInfo || exit /b
|
cmake .. -G "Visual Studio 12 Win64" -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo
|
||||||
|
|
||||||
For the 32-bit variant, use:
|
For the 32-bit variant, use:
|
||||||
|
|
||||||
cmake .. -G "Visual Studio 12" -DCMAKE_CONFIGURATION_TYPES=Release;RelWithDebInfo || exit /b
|
cmake .. -G "Visual Studio 12" -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo
|
||||||
|
|
||||||
After `cmake` has finished, go to the `Slic3r\build` directory and open the `Slic3r.sln` solution file.
|
After `cmake` has finished, go to the build directory and open the `Slic3r.sln` solution file.
|
||||||
This should open Visual Studio and load all the Slic3r solution containing all the projects.
|
This should open Visual Studio and load the Slic3r solution containing all the projects.
|
||||||
Make sure you use Visual Studio 2013 to open the solution.
|
Make sure you use Visual Studio 2013 to open the solution.
|
||||||
|
|
||||||
You can then use the usual Visual Studio controls to build Slic3r.
|
You can then use the usual Visual Studio controls to build Slic3r (Hit `F5` to build and run with debugger).
|
||||||
If you want to run or debug Slic3r from within Visual Studio, make sure the `slic3r` project is activated.
|
If you want to run or debug Slic3r from within Visual Studio, make sure the `XS` project is activated.
|
||||||
There are multiple projects in the Slic3r solution, but only the `slic3r` project is configured with the right
|
It should be set as the Startup project by CMake by default, but you might want to check anyway.
|
||||||
commands to run Slic3r.
|
There are multiple projects in the Slic3r solution, but only the `XS` project is configured with the right
|
||||||
|
commands to run and debug Slic3r.
|
||||||
|
|
||||||
|
The above cmake commands generate Visual Studio project files with the `RelWithDebInfo` configuration only.
|
||||||
|
If you also want to use the `Release` configuration, you can generate Visual Studio projects with:
|
||||||
|
|
||||||
|
-DCMAKE_CONFIGURATION_TYPES=Release;RelWithDebInfo
|
||||||
|
|
||||||
|
(The `Debug` configuration is not supported as of now.)
|
||||||
|
|
||||||
### Building with ninja
|
### Building with ninja
|
||||||
|
|
||||||
To use [Ninja](TODO), replace the `cmake` and `nmake` commands with:
|
To use [Ninja](https://ninja-build.org/), replace the `cmake` and `nmake` commands with:
|
||||||
|
|
||||||
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release
|
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release
|
||||||
ninja
|
ninja
|
||||||
|
@ -626,13 +626,8 @@ elseif (NOT MSVC)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
# Here we associate some additional properties with the MSVC projects to enable compilation and debugging out of the box.
|
# Here we associate some additional properties with the MSVC project to enable compilation and debugging out of the box.
|
||||||
# It seems a props file needs to be copied to the same dir as the proj file, otherwise MSVC doesn't load it up.
|
set_target_properties(XS PROPERTIES VS_USER_PROPS "${PROJECT_SOURCE_DIR}/cmake/msvc/xs.wperl64d.props")
|
||||||
# For copying, the configure_file() function seems to work much better than the file() function.
|
|
||||||
configure_file("${PROJECT_SOURCE_DIR}/cmake/msvc/xs.wperl64d.props" ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
|
|
||||||
set_target_properties(XS PROPERTIES VS_USER_PROPS "xs.wperl64d.props")
|
|
||||||
configure_file("${PROJECT_SOURCE_DIR}/cmake/msvc/slic3r.wperl64d.props" ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
|
|
||||||
set_target_properties(slic3r PROPERTIES VS_USER_PROPS "slic3r.wperl64d.props")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user