Merge topic 'geodesic_measurement_plugin' into next

Casey Goodlett · kwrobot · commit 1510790487cb · 2015-03-06T06:56:29.000-05:00
3d2e4ea Add link keywords and archive destination
diff --git a/Plugins/GeodesicMeasurementPlugin/CMakeLists.txt b/Plugins/GeodesicMeasurementPlugin/CMakeLists.txt
@@ -23,4 +23,4 @@ add_paraview_plugin( GeodesicMeasurement "1.0"
     vtkGeodesicsBetweenPoints.cxx
 )
 
-target_link_libraries( GeodesicMeasurement FmmMesh )
+target_link_libraries( GeodesicMeasurement LINK_PRIVATE FmmMesh )
diff --git a/Plugins/GeodesicMeasurementPlugin/FmmMesh/CMakeLists.txt b/Plugins/GeodesicMeasurementPlugin/FmmMesh/CMakeLists.txt
@@ -66,4 +66,5 @@ add_library( ${PROJECT_NAME}
 install(TARGETS ${PROJECT_NAME}
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
-)
+  ARCHIVE DESTINATION lib
+)

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ add_paraview_plugin( GeodesicMeasurement "1.0"`
`23`	`23`	`vtkGeodesicsBetweenPoints.cxx`
`24`	`24`	`)`
`25`	`25`
`26`		`-target_link_libraries( GeodesicMeasurement FmmMesh )`
	`26`	`+target_link_libraries( GeodesicMeasurement LINK_PRIVATE FmmMesh )`