diff --git a/cmake/GtsamBuildTypes.cmake b/cmake/GtsamBuildTypes.cmake index 2aad58abb..19314cd31 100644 --- a/cmake/GtsamBuildTypes.cmake +++ b/cmake/GtsamBuildTypes.cmake @@ -250,9 +250,9 @@ endif() # Make common binary output directory when on Windows if(WIN32) - set(RUNTIME_OUTPUT_PATH "${GTSAM_BINARY_DIR}/bin") - set(EXECUTABLE_OUTPUT_PATH "${GTSAM_BINARY_DIR}/bin") - set(LIBRARY_OUTPUT_PATH "${GTSAM_BINARY_DIR}/lib") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/lib") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/lib") endif() # Set up build type list for cmake-gui diff --git a/gtsam/3rdparty/cephes/CMakeLists.txt b/gtsam/3rdparty/cephes/CMakeLists.txt index aeac7b403..d510ddf81 100644 --- a/gtsam/3rdparty/cephes/CMakeLists.txt +++ b/gtsam/3rdparty/cephes/CMakeLists.txt @@ -106,8 +106,7 @@ if(WIN32) set_target_properties( cephes-gtsam PROPERTIES PREFIX "" - COMPILE_FLAGS /w - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") + COMPILE_FLAGS /w) endif() if(APPLE) diff --git a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt index f3b8694f4..e0a178c5b 100644 --- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt +++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt @@ -13,7 +13,6 @@ if(WIN32) set_target_properties(metis-gtsam PROPERTIES PREFIX "" COMPILE_FLAGS /w - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin" WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 87440d19f..5d71bb7be 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -185,8 +185,7 @@ if(WIN32) # Add 'lib' prefix to static library to avoid filename collision with else() set_target_properties(gtsam PROPERTIES PREFIX "" - DEFINE_SYMBOL GTSAM_EXPORTS - RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin") + DEFINE_SYMBOL GTSAM_EXPORTS) endif() endif() diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 1f7b4a7c7..730b6389a 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -108,8 +108,7 @@ if(WIN32) # Add 'lib' prefix to static library to avoid filename collision with else() set_target_properties(gtsam_unstable PROPERTIES PREFIX "" - DEFINE_SYMBOL GTSAM_UNSTABLE_EXPORTS - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") + DEFINE_SYMBOL GTSAM_UNSTABLE_EXPORTS) endif() endif()