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

Octave might work on windows now

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-10-03 15:30:57 +02:00
parent 16b15a395e
commit 3022d1889e
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@@ -11,6 +11,17 @@ endif()
set(CMAKE_INSTALL_PREFIX ${COOLPROP_INSTALL_PREFIX} CACHE PATH "default install path" FORCE)
#if (COOLPROP_OCTAVE_MODULE AND WIN32)
# IF( "$ENV{OCTAVE_ROOT}" STREQUAL "" )
# message(FATAL_ERROR "On windows, environmental variable OCTAVE_ROOT must be set to folder containing folders bin, include, etc. for octave")
# ENDIF()
# set(CMAKE_C_COMPILER "$ENV{OCTAVE_ROOT}/bin/gcc.exe")
# set(CMAKE_CXX_COMPILER "$ENV{OCTAVE_ROOT}/bin/g++.exe")
# message(STATUS "CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
# message(STATUS "CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
#endif()
#######################################
# PROJECT INFORMATION #
#-------------------------------------#
@@ -294,6 +305,11 @@ endif()
if (COOLPROP_OCTAVE_MODULE)
if (WIN32)
SET(ENV{PATH} "${OCTAVE_ROOT}/bin;$ENV{PATH}")
endif()
# Must have SWIG and Octave
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
@@ -319,7 +335,6 @@ if (COOLPROP_OCTAVE_MODULE)
${CMAKE_SOURCE_DIR}/include/AbstractState.h
)
SWIG_ADD_MODULE(CoolProp octave ${I_FILE} ${APP_SOURCES})
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIBRARIES})
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# We need to see which library to link with on OSX - clang++ or stdc++
@@ -333,7 +348,13 @@ if (COOLPROP_OCTAVE_MODULE)
endif()
if (WIN32)
include_directories($ENV{OCTAVE_ROOT}/include)
include_directories($ENV{OCTAVE_ROOT}/include/octave-${OCTAVE_VERSION}/octave)
set_target_properties(CoolProp PROPERTIES COMPILE_FLAGS "-fpermissive")
SWIG_LINK_LIBRARIES(CoolProp octave octinterp)
set_target_properties(CoolProp PROPERTIES LINK_FLAGS "-L$ENV{OCTAVE_ROOT}/lib/octave/${OCTAVE_VERSION}")
else()
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIBRARIES})
endif()
set_target_properties(CoolProp PROPERTIES SUFFIX ".oct" PREFIX "")

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

@@ -265,7 +265,11 @@ def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cm
factory.addStep(Git(repourl='git://github.com/CoolProp/CoolProp', mode=git_mode, submodules = True, progress=True, haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder, haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_"+mod_name.upper()+"_MODULE=ON","-DBUILD_TESTING=ON"]+cmake_args,
if mod_name.lower() == 'octave' and platform.lower() == 'windows:
pre = ['set','PATH=%OCTAVE_ROOT%/bin;%PATH%','&&']
else:
pre = []
factory.addStep(ShellCommand(command=' '.join(pre+["cmake", "..", "-DCOOLPROP_"+mod_name.upper()+"_MODULE=ON","-DBUILD_TESTING=ON"]+cmake_args),
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))