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

Harmonize library naming in R; see #668

Browse Source
This commit is contained in:
Ian Bell
2015-06-29 00:53:40 -06:00
parent bf423bf459
commit caf858b782
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -923,11 +923,6 @@ if (COOLPROP_R_MODULE)
SWIG_ADD_MODULE(CoolProp r ${I_FILE} ${APP_SOURCES})
SWIG_LINK_LIBRARIES(CoolProp "${R_LIBRARY}")
if (WIN32)
# No lib prefix for the shared library
set_target_properties(CoolProp PROPERTIES PREFIX "")
endif()
add_custom_command(TARGET CoolProp
POST_BUILD
COMMAND python example_generator.py R "${CMAKE_CURRENT_BINARY_DIR}/Example.R")

2
dev/scripts/examples/example_generator.py
View File

@@ -786,7 +786,7 @@ class R(BaseParser):
return l
def header(self):
return 'dyn.load(paste("CoolProp", .Platform$dynlib.ext, sep=""))\nsource("CoolProp.R")\ncacheMetaData(1)\n'
return 'dyn.load(paste("libCoolProp", .Platform$dynlib.ext, sep=""))\nsource("CoolProp.R")\ncacheMetaData(1)\n'
class MATLAB(BaseParser):