- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

- move test -> tests, this name is used elsewhere in lib/tests.
- change interface code not to loop on a float value (clang warning), harmless, but with extreme cases an eternal loop would still be possible though unlikely.
This commit is contained in:
Campbell Barton
2011-01-23 11:42:29 +00:00
parent 552b36733b
commit d75216ba1c
8 changed files with 9 additions and 6 deletions

View File

@@ -305,6 +305,7 @@ if(WITH_INSTALL)
endif()
if(WITH_PYTHON)
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
if(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
add_custom_command(TARGET blender
POST_BUILD
@@ -322,7 +323,7 @@ if(WITH_INSTALL)
COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
)
else()
if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_custom_command(TARGET blender
POST_BUILD
MAIN_DEPENDENCY blender