Commit d274c068 authored by Ben Boeckel's avatar Ben Boeckel Committed by Code Review
Browse files

Merge topic 'vs2010-missing-machine-arg' into master

b144b688 vtkpython: avoid vtkpythonrc hack in Visual Studio
parents 4af1ba28 b144b688
......@@ -8,8 +8,11 @@ if (WIN32)
# used here.
add_library(vtkpythonrc STATIC dummy.cxx vtkpython.rc)
elseif (CMAKE_GENERATOR MATCHES "Visual Studio")
set(extra_srcs vtkpython.rc)
else ()
set(building_vtkpythonrc TRUE)
set(extra_links vtkpythonrc)
# Make a separate directory scope for building vtkpythonrc.
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/vtkpythonrc")
endif ()
......@@ -70,10 +73,10 @@ vtk_write_python_modules_header_for_wrapped_modules(
add_executable(vtkpython vtkPythonAppInit.cxx)
add_executable(vtkpython vtkPythonAppInit.cxx ${extra_srcs})
if (WIN32)
target_link_libraries(vtkpython vtkpythonrc)
target_link_libraries(vtkpython ${extra_links})
endif ()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment