Windows cmake puts the dlls in RUNTIME_OUTPUT_DIRECTORY

This commit is contained in:
Spencer G. Jones 2014-02-12 15:28:34 -07:00
parent e5d7c363da
commit ae150fbfd3

View File

@ -317,14 +317,22 @@ endif()
set_target_properties( ${CLIENT_LIB} PROPERTIES PREFIX "") set_target_properties( ${CLIENT_LIB} PROPERTIES PREFIX "")
set_target_properties( ${SERVER_LIB} PROPERTIES PREFIX "") set_target_properties( ${SERVER_LIB} PROPERTIES PREFIX "")
if ( WIN32 ) if ( WIN32 OR CYGWIN )
# This is the extension for compiled Python modules on Windows # DLL platforms put dlls in the RUNTIME_OUTPUT_DIRECTORY
set_target_properties( ${CLIENT_LIB} PROPERTIES SUFFIX ".pyd") set_target_properties( ${CLIENT_LIB} PROPERTIES
set_target_properties( ${SERVER_LIB} PROPERTIES SUFFIX ".pyd") RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../python )
elseif ( CYGWIN ) set_target_properties( ${SERVER_LIB} PROPERTIES
# This is the extension for compiled Python modules in Cygwin RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../python )
set_target_properties( ${CLIENT_LIB} PROPERTIES SUFFIX ".dll")
set_target_properties( ${SERVER_LIB} PROPERTIES SUFFIX ".dll") if ( WIN32 )
# This is the extension for compiled Python modules on Windows
set_target_properties( ${CLIENT_LIB} PROPERTIES SUFFIX ".pyd")
set_target_properties( ${SERVER_LIB} PROPERTIES SUFFIX ".pyd")
elseif ( CYGWIN )
# This is the extension for compiled Python modules in Cygwin
set_target_properties( ${CLIENT_LIB} PROPERTIES SUFFIX ".dll")
set_target_properties( ${SERVER_LIB} PROPERTIES SUFFIX ".dll")
endif()
else() else()
# Even on macs, we want a .so extension instead of a .dylib which is what # Even on macs, we want a .so extension instead of a .dylib which is what
# cmake would give us by default. Python won't recognize a .dylib as a module, # cmake would give us by default. Python won't recognize a .dylib as a module,