gtsam_unstable build script tweaks for windows

release/4.3a0
Richard Roberts 2012-06-07 04:53:52 +00:00
parent c78e649042
commit 19542c27d5
2 changed files with 5 additions and 3 deletions

View File

@ -62,7 +62,7 @@ if (GTSAM_UNSTABLE_BUILD_SHARED_LIBRARY)
VERSION ${gtsam_unstable_version} VERSION ${gtsam_unstable_version}
SOVERSION ${gtsam_unstable_soversion}) SOVERSION ${gtsam_unstable_soversion})
target_link_libraries(gtsam_unstable-shared gtsam-shared) target_link_libraries(gtsam_unstable-shared gtsam-shared)
install(TARGETS gtsam_unstable-shared LIBRARY DESTINATION lib ) install(TARGETS gtsam_unstable-shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
endif(GTSAM_UNSTABLE_BUILD_SHARED_LIBRARY) endif(GTSAM_UNSTABLE_BUILD_SHARED_LIBRARY)
# Wrap version for gtsam_unstable # Wrap version for gtsam_unstable

View File

@ -40,10 +40,12 @@ if (GTSAM_BUILD_EXAMPLES)
set_target_properties(${example} PROPERTIES EXCLUDE_FROM_ALL ON) set_target_properties(${example} PROPERTIES EXCLUDE_FROM_ALL ON)
endif() endif()
add_dependencies(examples ${example}) if(NOT MSVC)
add_dependencies(examples ${example})
add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN})
endif()
add_dependencies(${example} gtsam-static gtsam_unstable-static) add_dependencies(${example} gtsam-static gtsam_unstable-static)
target_link_libraries(${example} gtsam-static gtsam_unstable-static) target_link_libraries(${example} gtsam-static gtsam_unstable-static)
add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN})
endforeach(example) endforeach(example)
endif (GTSAM_BUILD_EXAMPLES) endif (GTSAM_BUILD_EXAMPLES)