diff --git a/.cproject b/.cproject index 680e549ef..e9d7d08c9 100644 --- a/.cproject +++ b/.cproject @@ -1704,6 +1704,14 @@ true true + + make + -j5 + install + true + false + true + make -j2 diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 3499bff86..43a5c0110 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -19,7 +19,7 @@ add_subdirectory(3rdparty) # Accumulate gtsam_srcs set(gtsam_srcs ${ccolamd_srcs}) -# Get all sources and headers from each +# Get all sources and headers from each subdirectory foreach(subdir ${gtsam_subdirs}) message(STATUS "Building ${subdir}") file(GLOB sub_gtsam_srcs "${subdir}/*.cpp") @@ -31,16 +31,25 @@ foreach(subdir ${gtsam_subdirs}) endforeach(subdir) # build shared and static versions of the library -add_library(${PROJECT_NAME}-shared SHARED ${gtsam_srcs}) -set_target_properties(${PROJECT_NAME}-shared PROPERTIES OUTPUT_NAME "${PROJECT_NAME}") -set_target_properties(${PROJECT_NAME}-shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) -install(TARGETS ${PROJECT_NAME}-shared LIBRARY DESTINATION lib ) - add_library(${PROJECT_NAME}-static STATIC ${gtsam_srcs}) set_target_properties(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME "${PROJECT_NAME}") set_target_properties(${PROJECT_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(${PROJECT_NAME}-static PROPERTIES + VERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" + SOVERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" + ) install(TARGETS ${PROJECT_NAME}-static ARCHIVE DESTINATION lib) +add_library(${PROJECT_NAME}-shared SHARED ${gtsam_srcs}) +set_target_properties(${PROJECT_NAME}-shared PROPERTIES OUTPUT_NAME "${PROJECT_NAME}") +set_target_properties(${PROJECT_NAME}-shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(${PROJECT_NAME}-shared PROPERTIES + VERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" + SOVERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" + ) + +install(TARGETS ${PROJECT_NAME}-shared LIBRARY DESTINATION lib ) + # Get all sources and headers from each foreach(subdir ${gtsam_subdirs}) # Build tests