Skip to content

Commit

Permalink
Copy python_w to build's bin directory. Refs #5987
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Oct 23, 2012
1 parent d14a6aa commit 144ca55
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Code/Mantid/Build/CMake/WindowsSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ set ( PY_EXE_SUFFIX_RELEASE ".exe" )
set ( PY_EXE_SUFFIX_RELWITHDEBINFO ${PY_EXE_SUFFIX_RELEASE} )
set ( PY_EXE_SUFFIX_MINSIZEREL ${PY_EXE_SUFFIX_RELEASE} )
set ( PY_EXE_SUFFIX_DEBUG "_d.exe" )
# No terminal version
set ( PY_EXEW_PREFIX "${CMAKE_LIBRARY_PATH}/Python27/pythonw" )
set ( PY_EXEW_SUFFIX_RELEASE ".exe" )
set ( PY_EXEW_SUFFIX_RELWITHDEBINFO ${PY_EXE_SUFFIX_RELEASE} )
set ( PY_EXEW_SUFFIX_MINSIZEREL ${PY_EXE_SUFFIX_RELEASE} )
set ( PY_EXEW_SUFFIX_DEBUG "_d.exe" )


###########################################################################
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/PythonAPI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ if( WIN32 )

# Now the binary files
if ( MSVC_IDE )
foreach ( TYPE DLL EXE )
foreach ( TYPE DLL EXE EXEW )
add_custom_command( TARGET PythonAPI POST_BUILD
COMMAND SET ARGS PY_${TYPE}_SUFFIX_RELEASE=${PY_${TYPE}_SUFFIX_RELEASE}
COMMAND SET ARGS PY_${TYPE}_SUFFIX_RELWITHDEBINFO=${PY_${TYPE}_SUFFIX_RELWITHDEBINFO}
Expand All @@ -156,7 +156,7 @@ if( WIN32 )
)
endforeach ( TYPE )
else () # Need to do things slightly differently for nmake
foreach ( TYPE DLL EXE )
foreach ( TYPE DLL EXE EXEW )
add_custom_command( TARGET PythonAPI POST_BUILD
COMMAND SET ARGS PY_${TYPE}_SUFFIX_RELEASE=${PY_${TYPE}_SUFFIX_RELEASE}
COMMAND SET ARGS PY_${TYPE}_SUFFIX_RELWITHDEBINFO=${PY_${TYPE}_SUFFIX_RELWITHDEBINFO}
Expand Down

0 comments on commit 144ca55

Please sign in to comment.