Harmonize library naming in R; see #668

CoolProp · Jun 29, 2015 · caf858b · caf858b
1 parent bf423bf
commit caf858b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")

diff --git a/dev/scripts/examples/example_generator.py b/dev/scripts/examples/example_generator.py
@@ -786,7 +786,7 @@ def dict2string(self, d):
         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):