diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-23 14:42:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-23 14:42:29 +0300 |
| commit | d75216ba1c0fbaae1f2fe20741f23b9c35816eca (patch) | |
| tree | a3fe06755315972a3101cd75efaafdcb5c4d334b /source/creator | |
| parent | 552b36733bb2015aa64933bf3c57f1ad90c87b5a (diff) | |
- 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.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8db4954d876..2c89c3b6b9f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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 |