diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
| commit | fd2615fd9b5ac17a006cb3836ebd58e538517507 (patch) | |
| tree | a12938bf7f09ef36998b199a09efac3a344115c0 /build_files/cmake | |
| parent | 0d085790d13b2c261210addb12fabc1fea82bdef (diff) | |
| parent | ddf8c49736864fe89348c002fecaacdcb1c28c8e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 6313deb20c9..fc9e09b73fd 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -24,9 +24,13 @@ # Libraries configuration for any *nix system including Linux and Unix. # Detect precompiled library directory -set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) -string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) -set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME}) +if(NOT DEFINED LIBDIR) + set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) + string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME}) +else() + message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") +endif() if(EXISTS ${LIBDIR}) file(GLOB LIB_SUBDIRS ${LIBDIR}/*) |