12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed library versioning to get the symlinks correct in cmake install

release/4.3a0
Alex Cunningham 2012-01-31 19:59:12 +00:00
parent 6c87006b6a
commit b92e4a08dc
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -25,8 +25,8 @@ endif()
# Add debugging flags # Add debugging flags
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-inline -Wall") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-inline -Wall")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -fno-inline -Wall -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -fno-inline -Wall -DNDEBUG -DEIGEN_NO_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -Wall") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -Wall -DEIGEN_NO_DEBUG")
# Configurable Options # Configurable Options
# TODO # TODO

25
gtsam/CMakeLists.txt
View File

@ -45,25 +45,28 @@ set(gtsam_srcs
${slam_srcs} ${slam_srcs}
) )
# Versions
set(gtsam_version ${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH})
set(gtsam_soversion ${GTSAM_VERSION_MAJOR})
message(STATUS "GTSAM Version: ${gtsam_version}")
# build shared and static versions of the library # build shared and static versions of the library
message(STATUS "Building GTSAM - static") message(STATUS "Building GTSAM - static")
message(STATUS "GTSAM library sources ${gtsam_srcs}") #message(STATUS "GTSAM library sources ${gtsam_srcs}")
add_library(gtsam-static STATIC ${gtsam_srcs}) add_library(gtsam-static STATIC ${gtsam_srcs})
set_target_properties(gtsam-static PROPERTIES OUTPUT_NAME gtsam)
set_target_properties(gtsam-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
set_target_properties(gtsam-static PROPERTIES set_target_properties(gtsam-static PROPERTIES
VERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" OUTPUT_NAME gtsam
SOVERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" CLEAN_DIRECT_OUTPUT 1
) VERSION ${gtsam_version}
SOVERSION ${gtsam_soversion})
install(TARGETS gtsam-static ARCHIVE DESTINATION lib) install(TARGETS gtsam-static ARCHIVE DESTINATION lib)
message(STATUS "Building GTSAM - shared") message(STATUS "Building GTSAM - shared")
add_library(gtsam-shared SHARED ${gtsam_srcs}) add_library(gtsam-shared SHARED ${gtsam_srcs})
set_target_properties(gtsam-shared PROPERTIES OUTPUT_NAME gtsam)
set_target_properties(gtsam-shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
set_target_properties(gtsam-shared PROPERTIES set_target_properties(gtsam-shared PROPERTIES
VERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" OUTPUT_NAME gtsam
SOVERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}" CLEAN_DIRECT_OUTPUT 1
) VERSION ${gtsam_version}
SOVERSION ${gtsam_soversion})
install(TARGETS gtsam-shared LIBRARY DESTINATION lib ) install(TARGETS gtsam-shared LIBRARY DESTINATION lib )