diff options
| author |   Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-15 09:44:54 -0700 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2016-06-16 10:50:09 -0700 |
| commit | d53fd56c70531aa1cc7feaa5a3dffdb130bb2e95 (patch) | |
| tree | f4c6a03cad9e98d4df036095d9155da5a878ee12 | |
| parent | query_gpsdo_sensors: added OctoClock-G support (diff) | |
| download | uhd-d53fd56c70531aa1cc7feaa5a3dffdb130bb2e95.tar.xz uhd-d53fd56c70531aa1cc7feaa5a3dffdb130bb2e95.zip | |
cmake: allow UHD library and utilities to be in separate lib directories
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index 72e2f3f50..790ef72ad 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -119,11 +119,18 @@ SET_SOURCE_FILES_PROPERTIES( FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX} UHD_PKG_PATH) STRING(REPLACE "\\" "\\\\" UHD_PKG_PATH ${UHD_PKG_PATH}) +STRING(REGEX MATCH ".*/.*" SLASH "${LIB_SUFFIX}") +IF(SLASH STREQUAL "") + SET(UHD_LIB_DIR "lib${LIB_SUFFIX}") +ELSE() + SET(UHD_LIB_DIR "lib") +ENDIF(SLASH STREQUAL "") + SET_SOURCE_FILES_PROPERTIES( ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp ${CMAKE_CURRENT_SOURCE_DIR}/images.cpp PROPERTIES COMPILE_DEFINITIONS - "UHD_PKG_PATH=\"${UHD_PKG_PATH}\";UHD_LIB_DIR=\"lib${LIB_SUFFIX}\"" + "UHD_PKG_PATH=\"${UHD_PKG_PATH}\";UHD_LIB_DIR=\"${UHD_LIB_DIR}\"" ) ######################################################################## |