From 14c38918c05835035dff2321211ecb3d4d45fa0c Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Thu, 7 Jun 2012 20:42:13 +0000 Subject: [PATCH] Store flags for the library targets --- gtsam/CMakeLists.txt | 4 ++++ gtsam_unstable/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index eaf00d8d2..ac4cd8fe2 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -92,6 +92,7 @@ if (GTSAM_BUILD_STATIC_LIBRARY) VERSION ${gtsam_version} SOVERSION ${gtsam_soversion}) install(TARGETS gtsam-static ARCHIVE DESTINATION lib) + set(gtsam-lib "gtsam-static") endif (GTSAM_BUILD_STATIC_LIBRARY) if (GTSAM_BUILD_SHARED_LIBRARY) @@ -104,6 +105,9 @@ if (GTSAM_BUILD_SHARED_LIBRARY) VERSION ${gtsam_version} SOVERSION ${gtsam_soversion}) install(TARGETS gtsam-shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) + if (NOT GTSAM_BUILD_STATIC_LIBRARY) + set(gtsam-lib "gtsam-shared") + endif() endif(GTSAM_BUILD_SHARED_LIBRARY) # Create the matlab toolbox for the gtsam library diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 70333099e..7a7af3232 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -53,6 +53,7 @@ set_target_properties(gtsam_unstable-static PROPERTIES VERSION ${gtsam_unstable_version} SOVERSION ${gtsam_unstable_soversion}) target_link_libraries(gtsam_unstable-static gtsam-static) +set(gtsam_unstable-lib "gtsam_unstable-static") install(TARGETS gtsam_unstable-static ARCHIVE DESTINATION lib) if (GTSAM_UNSTABLE_BUILD_SHARED_LIBRARY)