diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 7637f6ea8..f5cbf9ac6 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -62,7 +62,7 @@ if (GTSAM_UNSTABLE_BUILD_SHARED_LIBRARY) VERSION ${gtsam_unstable_version} SOVERSION ${gtsam_unstable_soversion}) 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) # Wrap version for gtsam_unstable diff --git a/gtsam_unstable/discrete/CMakeLists.txt b/gtsam_unstable/discrete/CMakeLists.txt index edec85416..ae84426a8 100644 --- a/gtsam_unstable/discrete/CMakeLists.txt +++ b/gtsam_unstable/discrete/CMakeLists.txt @@ -40,10 +40,12 @@ if (GTSAM_BUILD_EXAMPLES) set_target_properties(${example} PROPERTIES EXCLUDE_FROM_ALL ON) 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) target_link_libraries(${example} gtsam-static gtsam_unstable-static) - add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) endforeach(example) endif (GTSAM_BUILD_EXAMPLES)