diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2016-03-30 16:15:07 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2016-03-30 16:15:17 +0300 |
| commit | 74d3f3746c644546f583587fc8d38f9538a0595f (patch) | |
| tree | bd5acb946bc878016c50b0a934a879525f8d4c92 /build_files | |
| parent | 119ce13a41d5c97debc431662e954c90e4bb3a59 (diff) | |
CMake cleanup target_link_libraries_decoupled
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c9cee9208ab..2b7a43b7e96 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -141,22 +141,6 @@ function(target_link_libraries_debug endforeach() endfunction() -function(target_link_libraries_decoupled - target - libraries_var - ) - - if(NOT MSVC) - target_link_libraries(${target} ${${libraries_var}}) - else() - # For MSVC we link to different libraries depending whether - # release or debug target is being built. - file_list_suffix(_libraries_debug "${${libraries_var}}" "_d") - target_link_libraries_debug(${target} "${_libraries_debug}") - target_link_libraries_optimized(${target} "${${libraries_var}}") - endif() -endfunction() - # Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/ # use it instead of include_directories() function(blender_include_dirs @@ -412,14 +396,7 @@ function(setup_liblinks endif() target_link_libraries(${target} ${JPEG_LIBRARIES}) if(WITH_IMAGE_OPENEXR) - if(WIN32 AND NOT UNIX AND NOT CMAKE_COMPILER_IS_GNUCC) - file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d") - target_link_libraries_debug(${target} "${OPENEXR_LIBRARIES_DEBUG}") - target_link_libraries_optimized(${target} "${OPENEXR_LIBRARIES}") - unset(OPENEXR_LIBRARIES_DEBUG) - else() - target_link_libraries(${target} ${OPENEXR_LIBRARIES}) - endif() + target_link_libraries(${target} ${OPENEXR_LIBRARIES}) endif() if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) |