github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated files for python building

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-08-03 16:09:27 +02:00
parent 4235013fea
commit 4d346c6921
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
CMakeLists.txt
View File

@@ -433,38 +433,37 @@ if (COOLPROP_MATLAB_MODULE)
endif()
if (COOLPROP_PYTHON_BINARIES)
if (WIN32)
set(COOLPROP_PYTHON_BINARY_VERSIONS bdist_wheel bdist_wininst)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(COOLPROP_PYTHON_BINARY_VERSIONS bdist_wheel)
endif()
if (DEFINED AND_UPLOAD)
set(_AND_UPLOAD upload)
else()
set(_AND_UPLOAD )
add_custom_target(CoolProp
COMMAND ${PYTHON_EXECUTABLE} setup.py bdist_wheel bdist_wininst --dist-dir=${CMAKE_INSTALL_PREFIX}/Python
COMMAND ${PYTHON_EXECUTABLE} setup.py ${COOLPROP_PYTHON_BINARY_VERSIONS} ${_AND_UPLOAD} --dist-dir=${CMAKE_INSTALL_PREFIX}/Python
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wrappers/Python
)
endif()
if (COOLPROP_PYTHON_PYPI)
if (DEFINED AND_UPLOAD)
set(_AND_UPLOAD upload)
else()
set(_AND_UPLOAD )
add_custom_target(CoolProp
COMMAND ${PYTHON_EXECUTABLE} prepare_pypi.py --dist-dir=${CMAKE_INSTALL_PREFIX}/Python
COMMAND ${PYTHON_EXECUTABLE} prepare_pypi.py ${_AND_UPLOAD} --dist-dir=${CMAKE_INSTALL_PREFIX}/Python
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wrappers/Python/pypi
)
endif()
if (COOLPROP_PYTHON_LOCAL_INSTALL)
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/Python/setup.py.in")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
set(DEPS "${CMAKE_CURRENT_SOURCE_DIR}/module/__init__.py")
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
configure_file(${SETUP_PY_IN} ${SETUP_PY})
add_custom_command(OUTPUT ${OUTPUT}
COMMAND ${PYTHON} ${SETUP_PY} build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${DEPS})
add_custom_target(target ALL DEPENDS ${OUTPUT})
install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)")
endif()
# NOT WORKING!
if (COOLPROP_MATHEMATICA_MODULE)

2
dev/buildbot/master/master.cfg
View File

@@ -70,7 +70,7 @@ def python_slave(key, cmake_args = [], cmake_env = {}, build_args = [], git_mode
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(ShellCommand(command=["cmake", "../..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))