Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michael Migliore
VTK
Commits
68cdd62c
Commit
68cdd62c
authored
7 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
cmake: comment out the old module system logic
parent
a5708c6a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/vtkWrapSettings.cmake
+0
-5
0 additions, 5 deletions
CMake/vtkWrapSettings.cmake
CMakeLists.txt
+6
-2
6 additions, 2 deletions
CMakeLists.txt
with
6 additions
and
7 deletions
CMake/vtkWrapSettings.cmake
+
0
−
5
View file @
68cdd62c
...
...
@@ -24,9 +24,6 @@ if(VTK_WRAP_PYTHON)
set
(
VTK_WRAP_PYTHON_EXE vtkWrapPython
)
set
(
VTK_WRAP_PYTHON_INIT_EXE vtkWrapPythonInit
)
endif
()
# Force the WrappingPythonCore module to on if wrapping is on
set
(
Module_vtkWrappingPythonCore
${
VTK_WRAP_PYTHON
}
CACHE BOOL
"Core Python wrapping library"
FORCE
)
option
(
VTK_WRAP_JAVA
"Should VTK Java wrapping be built?"
OFF
)
if
(
VTK_WRAP_JAVA
)
...
...
@@ -40,8 +37,6 @@ if(VTK_WRAP_JAVA)
set
(
VTK_JAVA_HOME
${
VTK_BINARY_DIR
}
/java/vtk
)
file
(
MAKE_DIRECTORY
${
VTK_JAVA_HOME
}
)
endif
()
set
(
Module_vtkWrappingJava
${
VTK_WRAP_JAVA
}
CACHE BOOL
"Core Java wrapping library"
FORCE
)
if
(
VTK_WRAP_PYTHON OR VTK_WRAP_JAVA OR VTK_WRAP_HIERARCHY
)
set
(
VTK_WRAP_HIERARCHY_EXE vtkWrapHierarchy
)
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
6
−
2
View file @
68cdd62c
...
...
@@ -57,7 +57,7 @@ include(vtkWrapSettings)
# Should be included after vtkTesting
include
(
vtkCompilerDynamicAnalysisFlags
)
include
(
vtkModuleMacros
)
#
include(vtkModuleMacros)
#-----------------------------------------------------------------------------
# Do we want examples built?
...
...
@@ -67,7 +67,7 @@ set(VTK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
#-----------------------------------------------------------------------------
# Add the Remote Subdirectory
add_subdirectory
(
Remote
)
#
add_subdirectory(Remote)
#-----------------------------------------------------------------------------
# Does VTK require support for 64 bit file systems
...
...
@@ -96,6 +96,8 @@ mark_as_advanced(VTK_ENABLE_KITS)
include
(
vtkEncodeString
)
if
(
FALSE
)
#----------------------------------------------------------------------
# Load the module DAG, assess all modules etc.
include
(
vtkModuleTop
)
...
...
@@ -169,6 +171,8 @@ if(VTK_DATA_EXCLUDE_FROM_ALL)
endif
()
endif
()
endif
()
#-----------------------------------------------------------------------------
# Install the license file
install
(
FILES
${
VTK_SOURCE_DIR
}
/Copyright.txt DESTINATION
${
VTK_INSTALL_DOC_DIR
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment