Update of build process on Windows systems

Author: fabrejc

build-win32.cmake

@@ -1,25 +1,26 @@
 
-# CMake script for building R OpenFLUID package (win32 binary) 
-# usage : cmake -P build-win32.cmake 
+# CMake script for building R OpenFLUID package (win32 binary)
+# usage : cmake -P build-win32.cmake
 
 # This script must be launched from MSYS console
 
-# Notice that environment variables must be correctly set 
-# in order to find the OpenFLUID framework, the R environnement 
+# Notice that environment variables must be correctly set
+# in order to find the OpenFLUID framework, the R environnement
 # and GCC tools (C++11)
 # See file win32-env.sh.tpl for more information
- 
+
 
 INCLUDE("config.in.cmake")
 
 INCLUDE("cmake/display-infos.cmake")
 INCLUDE("cmake/preprocess.cmake")
 
 
-EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" 
+EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}"
                 "-E" "chdir" "${BUILDDIR}"
                 "R" "CMD" "build" "ROpenFLUID")
-                
-EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" 
+
+EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}"
                 "-E" "chdir" "${BUILDDIR}"
-                "R" "CMD" "INSTALL" "--build" "ROpenFLUID") 
+                "R" "CMD" "INSTALL" "--build" "--no-test-load"
+                                    "--library=${BUILDLIBRDIR}" "ROpenFLUID")

cmake/preprocess.cmake

@@ -3,8 +3,9 @@
 FILE(MAKE_DIRECTORY ${BUILDDIR})
 FILE(REMOVE_RECURSE ${PACKAGEBUILDDIR})
 FILE(MAKE_DIRECTORY ${PACKAGEBUILDDIR})
+FILE(MAKE_DIRECTORY ${BUILDLIBRDIR})
 
-FILE(COPY "${PACKAGESRCDIR}/" 
+FILE(COPY "${PACKAGESRCDIR}/"
        DESTINATION "${PACKAGEBUILDDIR}"
        PATTERN ".*" EXCLUDE
        PATTERN "_*" EXCLUDE
@@ -21,8 +22,8 @@ CONFIGURE_FILE(${RESOURCESDIR}/tests/PrimitivesExampleSelectedOutputs.R.in ${PAC
 
 
 
-EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" 
+EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}"
                 "-E" "chdir" "${PACKAGEBUILDDIR}"
                 "R" "CMD" "BATCH" "--vanilla" "${RESOURCESDIR}/roxygen2.R")
 
-FILE(REMOVE "${PACKAGEBUILDDIR}/roxygen2.Rout")
+FILE(REMOVE "${PACKAGEBUILDDIR}/roxygen2.Rout")

config.in.cmake

@@ -7,15 +7,18 @@ IF(WIN32)
   SET(BUILDDIR "${BUILDDIR}-win32")
 ENDIF()
 SET(PACKAGEBUILDDIR "${BUILDDIR}/ROpenFLUID")
-SET(REQUIRED_OPENFLUID_VERSION "2.1.6")
+SET(BUILDLIBRDIR "${BUILDDIR}/_Rlibrary")
 
 # Title and description
 SET(OpenFLUID_R_TITLE "R Interface to OpenFLUID Platform Framework for Modelling and Simulation of Landscapes")
 SET(OpenFLUID_R_DESC "Provides a collection of functions to load, parameterize, run and analyze OpenFLUID simulations within the GNU R environment.")
 
-# Version
+# ROpenFLUID Version
 SET(OpenFLUID_R_VERSION_PATCH "20180726")
 
+# Required OpenFLUID version
+SET(REQUIRED_OPENFLUID_VERSION "2.1.6")
+
 
 # ===========================================================================================