diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-19 20:31:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-19 20:31:15 +0100 |
| commit | adb20365db6dec7c7a4e23cd8b2feb78e83a7a33 (patch) | |
| tree | 07b8ba0fdcd0ed1e5308d73852fc7bb5ce0b4770 /host/lib/CMakeLists.txt | |
| parent | 9e6ff291b464f7ae7cbc7abfe29b34550badeb74 (diff) | |
| parent | 2a49dbbc8acdd601eb4d541b43bcfa6724333785 (diff) | |
| download | uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.tar.gz uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.tar.bz2 uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/types/CMakeLists.txt
Diffstat (limited to 'host/lib/CMakeLists.txt')
| -rw-r--r-- | host/lib/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index eed8b642c..5755a6c4c 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010-2014 Ettus Research LLC +# Copyright 2010-2015 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -128,3 +128,14 @@ IF(NOT UHDHOST_PKG) #Syntax makes it unusable by UHD_INSTALL RUNTIME DESTINATION ${RUNTIME_DIR} COMPONENT libraries # .dll file ) ENDIF(NOT UHDHOST_PKG) + +####################################################### +# Setup libuhd library (static) +####################################################### +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY(uhd_static STATIC ${libuhd_sources}) + SET_TARGET_PROPERTIES(uhd_static PROPERTIES OUTPUT_NAME uhd) + INSTALL(TARGETS uhd_static + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib or .a file + ) +ENDIF(ENABLE_STATIC_LIBS) |