Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.

Browse Source 
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
This commit is contained in:
Campbell Barton
2011-01-25 14:43:13 +00:00
parent da2b490198
commit 1bd0db59f4
23 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/macros.cmake
View File

@@ -128,10 +128,10 @@ macro(setup_liblinks
target_link_libraries(${target} ${PYTHON_LINKFLAGS})
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} debug ${PYTHON_LIB}_d)
target_link_libraries(${target} optimized ${PYTHON_LIB})
target_link_libraries(${target} debug ${PYTHON_LIBRARY}_d)
target_link_libraries(${target} optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(${target} ${PYTHON_LIB})
target_link_libraries(${target} ${PYTHON_LIBRARY})
endif()
endif()