diff options
| author | Alexander Kuznetsov <kuzsasha@gmail.com> | 2011-12-31 02:10:48 +0400 |
|---|---|---|
| committer | Alexander Kuznetsov <kuzsasha@gmail.com> | 2011-12-31 02:10:48 +0400 |
| commit | 4b9457dd4ab4e68005c2eaf0e021a75b6a500f89 (patch) | |
| tree | 993e0b8ca823ac76cac77da3cbaea888d6a9bb12 /build_files | |
| parent | fe9b909187e205124400ed6473130cbf4eb305e8 (diff) | |
Patch is partially made by Pelle Johnsen. Thanks!
This patch enables search for specific libraries for vc2010 using "set_lib_path" macro
If *x* library or path exists in lib/win___/vc2010/*x* , vc2010 will use it. If not, compiler will use standard libraries.
It can be easily extended to gcc.
The function is enabled for:
openCollada
openExr
Python
openImageIO
The different libraries are needed for different compilers because C++ was used. There is no standard for lib's C++ structure/functions' names.
Actual libs will follow
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c6a834050d0..406f2537dce 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -665,3 +665,16 @@ function(delayed_do_install endif() endfunction() +macro(set_lib_path + lvar + lproj) + + + if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj}) + set(${lvar} ${LIBDIR}/vc2010/${lproj}) + else() + set(${lvar} ${LIBDIR}/${lproj}) + endif() + + +endmacro()
\ No newline at end of file |