Use newer binary output directory variables and don't specify output directory on each target
parent
82d0ebc8fe
commit
6bb70df05b
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue