Merge remote branch 'origin/V7_dev'

diff --git a/adm/cmake/FindSalomePythonLibs.cmake b/adm/cmake/FindSalomePythonLibs.cmake
index 2228abb1d0f501796fff4ac87abbe3c42d8d66f1..993aeee6c6b3a97507d3c8501a331254eb1645e7 100644 (file)
--- a/adm/cmake/FindSalomePythonLibs.cmake
+++ b/adm/cmake/FindSalomePythonLibs.cmake
@@ -36,6 +36,9 @@ IF (SALOMEPYTHONINTERP_FOUND AND NOT "${PYTHON_VERSION_STRING}" STREQUAL "")
    SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING})
    SET(PythonLibs_FIND_VERSION_MAJOR ${PYTHON_VERSION_MAJOR})
 ENDIF()
+IF(WIN32)
+  set(CMAKE_LIBRARY_PATH "${PYTHON_ROOT_DIR}/libs")
+ENDIF()
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonLibs PYTHON_INCLUDE_DIR 2)
 
 IF(SALOMEPYTHONLIBS_FOUND) 

diff --git a/src/evalyfx/YACSEvalResource.hxx b/src/evalyfx/YACSEvalResource.hxx
index 0958e1972fac6c3f35f1f0bea0699e44fd47886f..0155e9516a30b0c037dab3a82b367601a3c2dbb1 100644 (file)
--- a/src/evalyfx/YACSEvalResource.hxx
+++ b/src/evalyfx/YACSEvalResource.hxx
@@ -136,7 +136,7 @@ class YACSEvalParamsForCluster
 public:
   YACSEvalParamsForCluster():_exclusiveness(false),_nbOfProcs(1) { }
   bool getExclusiveness() const { return _exclusiveness; }
-  void setExclusiveness(bool newStatus);
+  YACSEVALYFX_EXPORT void setExclusiveness(bool newStatus);
   std::string getRemoteWorkingDir() const { return _remoteWorkingDir; }
   void setRemoteWorkingDir(const std::string& remoteWorkingDir) { _remoteWorkingDir=remoteWorkingDir; }
   std::string getLocalWorkingDir() const { return _localWorkingDir; }
@@ -147,7 +147,7 @@ public:
   void setNbProcs(unsigned int nbProcs) { _nbOfProcs=nbProcs; }
   void setMaxDuration(const std::string& maxDuration) { _maxDuration=maxDuration; }
   std::string getMaxDuration() const { return _maxDuration; }
-  void checkConsistency() const;
+  YACSEVALYFX_EXPORT void checkConsistency() const;
 private:
   bool _exclusiveness;
   std::string _remoteWorkingDir;