Merged in fix/apple-sip-dylib-lookup (pull request #307)
Set the INSTALL_NAME on the shared libraries. Approved-by: Frank Dellaert <dellaert@cc.gatech.edu>release/4.3a0
						commit
						3e6a39f5e1
					
				|  | @ -15,6 +15,12 @@ if(WIN32) | ||||||
| 			RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") | 			RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
|  | if (APPLE) | ||||||
|  | 		set_target_properties(metis PROPERTIES | ||||||
|  | 			INSTALL_NAME_DIR | ||||||
|  | 			"${CMAKE_INSTALL_PREFIX}/lib") | ||||||
|  |  endif() | ||||||
|  | 
 | ||||||
| install(TARGETS metis EXPORT GTSAM-exports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) | install(TARGETS metis EXPORT GTSAM-exports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) | ||||||
| list(APPEND GTSAM_EXPORTED_TARGETS metis) | list(APPEND GTSAM_EXPORTED_TARGETS metis) | ||||||
| set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) | set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) | ||||||
|  |  | ||||||
|  | @ -130,6 +130,11 @@ else() | ||||||
| 			DEFINE_SYMBOL GTSAM_EXPORTS | 			DEFINE_SYMBOL GTSAM_EXPORTS | ||||||
| 			RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") | 			RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") | ||||||
| 	endif() | 	endif() | ||||||
|  | 	if (APPLE) | ||||||
|  | 		set_target_properties(gtsam PROPERTIES | ||||||
|  | 			INSTALL_NAME_DIR | ||||||
|  | 			"${CMAKE_INSTALL_PREFIX}/lib") | ||||||
|  | 	endif() | ||||||
|     install(TARGETS gtsam EXPORT GTSAM-exports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) |     install(TARGETS gtsam EXPORT GTSAM-exports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) | ||||||
|     list(APPEND GTSAM_EXPORTED_TARGETS gtsam) |     list(APPEND GTSAM_EXPORTED_TARGETS gtsam) | ||||||
|     set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) |     set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue