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

Added shared libraries

Browse Source
This commit is contained in:
Ian Bell
2014-08-01 22:17:34 +02:00
parent f653a7559f
commit ffa9f536d6
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -140,7 +140,7 @@ if (COOLPROP_STATIC_LIBRARY)
install (TARGETS ${app_name} DESTINATION static_library/${CMAKE_SYSTEM_NAME})
endif()
if (COOLPROP_64BIT_SHARED_LIBRARY)
if (COOLPROP_64BIT_SHARED_LIBRARY_MODULE)
add_library(${app_name} SHARED ${APP_SOURCES})
set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB")
if (!MSVC)
@@ -151,7 +151,7 @@ if (COOLPROP_64BIT_SHARED_LIBRARY)
install (TARGETS ${app_name} DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/64bit)
endif()
if (COOLPROP_32BIT_CDECL_SHARED_LIBRARY)
if (COOLPROP_32BIT_CDECL_SHARED_LIBRARY_MODULE)
add_library(${app_name} SHARED ${APP_SOURCES})
set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl")
if (!MSVC)
@@ -162,7 +162,7 @@ if (COOLPROP_32BIT_CDECL_SHARED_LIBRARY)
install (TARGETS ${app_name} DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/32bit__cdecl_calling_convention)
endif()
if (COOLPROP_32BIT_STDCALL_SHARED_LIBRARY)
if (COOLPROP_32BIT_STDCALL_SHARED_LIBRARY_MODULE)
add_library(${app_name} SHARED ${APP_SOURCES})
set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__stdcall")
if (!MSVC)

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

@@ -61,7 +61,7 @@ def sphinx_slave(generator = "Unix Makefiles", git_mode = 'incremental'):
factory.addStep(DirectoryUpload(slavesrc="Web/_build/html",masterdest="public_html/sphinx",url="sphinx",compress="bz2"))
return factory
def cmake_slave(mod_name, git_mode = 'incremental', install = True, cmake_args = [], build_args = [], ctest_args = [], cmake_env={}):
def cmake_slave(mod_name, git_mode = 'incremental', install = True, cmake_args = [], build_args = [], ctest_args = [], cmake_env={}, test = True):
"""
Parameters
----------
@@ -94,7 +94,8 @@ def cmake_slave(mod_name, git_mode = 'incremental', install = True, cmake_args =
factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"]+build_args, workdir = working_folder, haltOnFailure = True))
else:
factory.addStep(ShellCommand(command=["cmake", "--build", "."]+build_args, workdir = working_folder, haltOnFailure = True))
factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True))
if test:
factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True))
if install:
factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest="public_html/binaries",url="binaries",compress="bz2"))
return factory
@@ -103,7 +104,6 @@ from buildbot.config import BuilderConfig
c['builders'] = []
c['builders'].append(
BuilderConfig(name="Catch-OSX",
slavenames=["OSX-slave"],
@@ -129,7 +129,34 @@ for wrapper in ['Java','MATLAB','Csharp','Octave']:
factory = cmake_slave(wrapper)
)
)
c['builders'].append(
BuilderConfig(name="64bitDLL-windows",
slavenames=["windows-slave"],
factory = cmake_slave('64BIT_SHARED_LIBRARY',
test = False,
cmake_args=['-G','Visual Studio 10 2010 Win64']
)
)
)
c['builders'].append(
BuilderConfig(name="32bitCdeclDLL-windows",
slavenames=["windows-slave"],
factory = cmake_slave('32BIT_CDECL_SHARED_LIBRARY',
test = False,
cmake_args=['-G','Visual Studio 10 2010']
)
)
)
c['builders'].append(
BuilderConfig(name="64bitStdcallDLL-windows",
slavenames=["windows-slave"],
factory = cmake_slave('32BIT_STDCALL_SHARED_LIBRARY',
test = False,
cmake_args=['-G','Visual Studio 10 2010']
)
)
)
c['builders'].append(
BuilderConfig(name="Java-windows",
slavenames=["windows-slave"],