diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-25 14:18:41 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-25 14:18:41 +0300 |
| commit | b4f849b9c645125946d688262c2f1f9dceb83899 (patch) | |
| tree | 04e452cf454ba21b885e3634f6daaddf46b3e8f4 /build_files | |
| parent | 392551bd95e0267c86d9275423b69ea7637eb505 (diff) | |
| parent | 3e7100644861368b5ec951cf36c631e0828012f8 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindJack.cmake | 12 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index 9a847fabf70..caafa3c34a1 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -1,15 +1,15 @@ -# - Find Jack library -# Find the native Jack includes and library +# - Find JACK library +# Find the native JACK includes and library # This module defines # JACK_INCLUDE_DIRS, where to find jack.h, Set when # JACK_INCLUDE_DIR is found. -# JACK_LIBRARIES, libraries to link against to use Jack. -# JACK_ROOT_DIR, The base directory to search for Jack. +# JACK_LIBRARIES, libraries to link against to use JACK. +# JACK_ROOT_DIR, The base directory to search for JACK. # This can also be an environment variable. -# JACK_FOUND, If false, do not try to use Jack. +# JACK_FOUND, If false, do not try to use JACK. # # also defined, but not for general use are -# JACK_LIBRARY, where to find the Jack library. +# JACK_LIBRARY, where to find the JACK library. #============================================================================= # Copyright 2011 Blender Foundation. diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 5a67ac981a3..2e3a1907063 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -518,7 +518,8 @@ function(setup_liblinks target_link_libraries(${target} ${BLENDER_GL_LIBRARIES}) - target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) + #target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) + target_link_libraries(${target} ${PLATFORM_LINKLIBS}) endfunction() |