diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 10:30:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 10:30:41 +0300 |
commit | 03a5eccc945497da3cffafdf050c17fb4ccf999c (patch) | |
tree | b451841a8bb0e614184de8a530322f4e45736b51 /build_files/cmake | |
parent | 84d39ab97bba5d4885a062363c8b3f3d28cb7da7 (diff) | |
parent | 28d2148b09a2d975876f4418bd5ba15ab5edea8d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake')
-rw-r--r-- | build_files/cmake/Modules/FindSDL2.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 3 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index 7c40a6ef6f3..e84c6845156 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -42,7 +42,7 @@ FIND_PATH(SDL2_INCLUDE_DIR HINTS ${_sdl2_SEARCH_DIRS} PATH_SUFFIXES - include/SDL2 include + include/SDL2 include SDL2 ) FIND_LIBRARY(SDL2_LIBRARY diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index cdc63ef8fba..2e16b9238b3 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1519,6 +1519,7 @@ function(find_python_package PATH_SUFFIXES site-packages dist-packages + vendor-packages NO_DEFAULT_PATH ) @@ -1529,6 +1530,8 @@ function(find_python_package "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', " "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', " "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', " + "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/vendor-packages/${package}', " + "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/vendor-packages/${package}', " "\n" "The 'WITH_PYTHON_INSTALL_${_upper_package}' option will be ignored when installing Python.\n" "The build will be usable, only add-ons that depend on this package won't be functional." diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 3581fe64341..d5e29164696 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -358,7 +358,11 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) endif() # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed -list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm) +if(HAIKU) + list(APPEND PLATFORM_LINKLIBS -lnetwork) +else() + list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm) +endif() find_package(Threads REQUIRED) list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT}) |