Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-08-05 00:25:04 +0400
committerThomas Dinges <blender@dingto.org>2012-08-05 00:25:04 +0400
commitab1badf9a2df33a8d5750c42187100c76703069d (patch)
tree6760de1283edc789648fcc80fcb945685f545a9d /source/creator
parent2044b62370f3e26037699577824201fb684578a1 (diff)
Windows MSVC libraries:
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0a70aa0ddf1..056c6e32ec2 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -475,15 +475,15 @@ elseif(WIN32)
endif()
if(WITH_PYTHON)
- set_lib_path(PYLIB "python/lib")
+ set_lib_path(PYLIB "python")
install(
- FILES ${PYLIB}/python32.dll
+ FILES ${PYLIB}/lib/python32.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
- FILES ${PYLIB}/python32_d.dll
+ FILES ${PYLIB}/lib/python32_d.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Debug
)
@@ -627,10 +627,10 @@ elseif(WIN32)
if(WITH_OPENIMAGEIO)
if(NOT MINGW)
- set_lib_path(OIIOBIN "openimageio/bin")
+ set_lib_path(OIIOBIN "openimageio")
install(
FILES
- ${OIIOBIN}/OpenImageIO.dll
+ ${OIIOBIN}/bin/OpenImageIO.dll
DESTINATION ${TARGETDIR}
)
endif()