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 /source/creator | |
| 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 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index cbf3ad16bcd..bfb27f0a20f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -437,15 +437,15 @@ elseif(WIN32) # ) if(WITH_PYTHON) - + set_lib_path(PYLIB "python/lib") install( - FILES ${LIBDIR}/python/lib/python32.dll + FILES ${PYLIB}/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel ) install( - FILES ${LIBDIR}/python/lib/python32_d.dll + FILES ${PYLIB}/python32_d.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Debug ) @@ -558,9 +558,10 @@ elseif(WIN32) ) if(WITH_OPENIMAGEIO) + set_lib_path(OIIOBIN "openimageio/bin") install( FILES - ${LIBDIR}/openimageio/bin/OpenImageIO.dll + ${OIIOBIN}/OpenImageIO.dll DESTINATION ${TARGETDIR} ) endif() |