diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-25 17:43:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-25 17:43:13 +0300 |
| commit | 1bd0db59f4750dd9603d82544f63d89f53288a93 (patch) | |
| tree | def1e4adfe1cf7aa3fba0e008ce58951cbe4f813 /build_files | |
| parent | da2b4901981e4180f763f45bf8e3bd4262539ad2 (diff) | |
use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 2b044e4df1f..70380a7c708 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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() |