diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
| commit | f693349f12a66cfad2159779757e2ea1d6d483be (patch) | |
| tree | 1c335011ec094ab03b3faaf892792b60ed3b80c4 /host/lib/utils | |
| parent | e103b5e67061c9b22cce2e36cf9b40a8213ecb82 (diff) | |
| parent | 9cc4e16b77d074c8d416725ead1afb8898007eb3 (diff) | |
| download | uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.gz uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.bz2 uhd-f693349f12a66cfad2159779757e2ea1d6d483be.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/utils')
| -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}\"" ) ######################################################################## |