bos #33720: port YDEFX to windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5d03fc039e58bc4f29059a272fceef3e8abe6a4..ec48e2f3e0dbb2a78e9b40787a002fa2a8ad1ca0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,10 @@ SET (CMAKE_CXX_STANDARD 11)
 ENABLE_TESTING()
 SET(BUILD_SHARED_LIBS TRUE)
 
+IF(WIN32)
+  SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ENDIF(WIN32)
+
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
 IF(EXISTS ${CONFIGURATION_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
@@ -45,10 +49,12 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 INCLUDE(SalomeSetupPlatform)   # From CONFIGURATION
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-
 OPTION(YDEFX_BUILD_GUI "Generate widgets" ON)
-
-FIND_PACKAGE(Py2cpp REQUIRED)
+IF(WIN32)
+  SET(PY2CPP_ROOT_DIR $ENV{PY2CPP_ROOT_DIR})
+ELSE(WIN32)
+  FIND_PACKAGE(Py2cpp REQUIRED)
+ENDIF(WIN32)
 
 IF(NOT SalomeKERNEL_FOUND)
   MESSAGE("SalomeKERNEL not found. Salome installation paths will not be used")

diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 1d82cf2b2082e1d0dd7ddc85ffd7d8e15668fcc1..103071074c11d285cfb3af0e2306cb4984f9238f 100644 (file)
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -47,20 +47,33 @@ SET(ydefx_HEADERS
   Launcher.hxx
   PyStudyJob.hxx
   TPyStudyJob.hxx
-  ydefxExports.hxx
 )
 
-SET(ydefx_LINK
-  py2cpp
-  ${PYTHON_LIBRARIES}
-)
+IF(WIN32)
+  SET(ydefx_LINK
+    ${PY2CPP_ROOT_DIR}/lib/py2cpp.lib
+    ${PYTHON_LIBRARIES}
+    ${PLATFORM_LIBS}
+    )
+ELSE(WIN32)
+  SET(ydefx_LINK
+    py2cpp
+    ${PYTHON_LIBRARIES}
+  )
+ENDIF(WIN32)
 
 ADD_LIBRARY(ydefx ${ydefx_SOURCES})
 TARGET_LINK_LIBRARIES(ydefx ${ydefx_LINK})
-TARGET_INCLUDE_DIRECTORIES(ydefx PUBLIC
-                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cpp>
-                          $<INSTALL_INTERFACE:${SALOME_INSTALL_HEADERS}>)
-
+IF(WIN32)
+  TARGET_INCLUDE_DIRECTORIES(ydefx PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cpp>
+                             $<INSTALL_INTERFACE:${SALOME_INSTALL_HEADERS}>
+                             ${PY2CPP_ROOT_DIR}/include)
+ELSE(WIN32)
+  TARGET_INCLUDE_DIRECTORIES(ydefx PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cpp>
+                             $<INSTALL_INTERFACE:${SALOME_INSTALL_HEADERS}>)
+ENDIF(WIN32)
 INSTALL(TARGETS ydefx DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(TARGETS ydefx EXPORT ydefxCfg_cmake LIBRARY DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(FILES ${ydefx_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}/ydefx)

diff --git a/src/cpp/Exceptions.hxx b/src/cpp/Exceptions.hxx
index 3ed0260518f8ba96ddcf75bc0b833ae4d8c4df5b..0c832e34d401f5541f482b734a7f0bdba5785733 100644 (file)
--- a/src/cpp/Exceptions.hxx
+++ b/src/cpp/Exceptions.hxx
@@ -18,12 +18,11 @@
 //
 #ifndef YDEFX_EXCEPTIONS_HXX
 #define YDEFX_EXCEPTIONS_HXX
-#include "ydefxExports.hxx"
 #include <string>
 
 namespace ydefx
 {
-class YDEFX_EXPORT Exception:public std::exception
+class Exception:public std::exception
 {
 public:
   Exception(const std::string& message);

diff --git a/src/cpp/Job.hxx b/src/cpp/Job.hxx
index 57007d0ee5f55875758f489ee4b7b53b756a202b..86cae676dd572dea0488f2535e5d621b930aa1c9 100644 (file)
--- a/src/cpp/Job.hxx
+++ b/src/cpp/Job.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef YDEFX_JOB_H
 #define YDEFX_JOB_H
-#include "ydefxExports.hxx"
 #include <string>
 
 namespace ydefx
 {
 
-class YDEFX_EXPORT Job
+class Job
 {
 public:
   virtual ~Job(){}

diff --git a/src/cpp/JobParametersProxy.hxx b/src/cpp/JobParametersProxy.hxx
index f8a9069f7dff6c8607fc5504e7ed8f3f6588c899..aa95cae53a5d9407b1ff258b2d2e0d3c988649b3 100644 (file)
--- a/src/cpp/JobParametersProxy.hxx
+++ b/src/cpp/JobParametersProxy.hxx
@@ -18,7 +18,6 @@
 //
 #ifndef YDEFX_JOBPARAMETERSPROXY_H
 #define YDEFX_JOBPARAMETERSPROXY_H
-#include "ydefxExports.hxx"
 #include <string>
 #include <list>
 #include <map>
@@ -26,7 +25,7 @@
 
 namespace ydefx
 {
-class YDEFX_EXPORT JobParametersProxy
+class JobParametersProxy
 {
 public:
   JobParametersProxy();

diff --git a/src/cpp/Launcher.hxx b/src/cpp/Launcher.hxx
index c2d241c9076cf31fd8833644757f18f358c34105..78492c3c054709c4ff83b41b3f31b3edb600c4fd 100644 (file)
--- a/src/cpp/Launcher.hxx
+++ b/src/cpp/Launcher.hxx
@@ -19,14 +19,13 @@
 #ifndef YDEFX_LAUNCHER_H
 #define YDEFX_LAUNCHER_H
 
-#include "ydefxExports.hxx"
 #include "TMonoPyJob.hxx"
 #include "TPyStudyJob.hxx"
 
 namespace ydefx
 {
 class Job;
-class YDEFX_EXPORT Launcher
+class Launcher
 {
 public:
   Launcher():_lastError(){}

diff --git a/src/cpp/MonoPyJob.hxx b/src/cpp/MonoPyJob.hxx
index 9f4e7ab4677f7221dca96c6a08c999b6be98422d..5f011e63bf9f6c364e6ac418271a5a386f9b62ee 100644 (file)
--- a/src/cpp/MonoPyJob.hxx
+++ b/src/cpp/MonoPyJob.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef YDEFX_MONOPYJOB_HXX
 #define YDEFX_MONOPYJOB_HXX
-#include "ydefxExports.hxx"
 #include "Job.hxx"
 #include <py2cpp/PyPtr.hxx>
 
 namespace ydefx
 {
-class YDEFX_EXPORT MonoPyJob : public Job
+class MonoPyJob : public Job
 {
 public:
   MonoPyJob();

diff --git a/src/cpp/PyConversions.hxx b/src/cpp/PyConversions.hxx
index 493de2368f95e5cb93ad0feed22f2b4beef8ae47..a5402189e3bb0ca4f101c58fe6690941d5efc28a 100644 (file)
--- a/src/cpp/PyConversions.hxx
+++ b/src/cpp/PyConversions.hxx
@@ -18,7 +18,6 @@
 //
 #ifndef YDEFX_PYCONVERSIONS_HXX
 #define YDEFX_PYCONVERSIONS_HXX
-#include "ydefxExports.hxx"
 #include <py2cpp/PyPtr.hxx>
 
 namespace ydefx
@@ -28,8 +27,8 @@ class PyStudyFunction;
 }
 namespace py2cpp
 {
-YDEFX_EXPORT PyObject * toPy(const ydefx::JobParametersProxy& jp);
-YDEFX_EXPORT PyObject * toPy(const ydefx::PyStudyFunction& jp);
+PyObject * toPy(const ydefx::JobParametersProxy& jp);
+PyObject * toPy(const ydefx::PyStudyFunction& jp);
 }
 
 #include <py2cpp/py2cpp.hxx>

diff --git a/src/cpp/PyStudyFunction.hxx b/src/cpp/PyStudyFunction.hxx
index 6b4541634fc909d1349608396cb2befea08f2035..973417afabe025993b48c53ea8ffef9fd6f06738 100644 (file)
--- a/src/cpp/PyStudyFunction.hxx
+++ b/src/cpp/PyStudyFunction.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef YDEFX_PYSTUDYFUNCTION_H
 #define YDEFX_PYSTUDYFUNCTION_H
-#include "ydefxExports.hxx"
 #include "StudyFunction.hxx"
 #include "PyConversions.hxx"
 
 namespace ydefx
 {
-class YDEFX_EXPORT PyStudyFunction :  StudyFunction
+class PyStudyFunction :  StudyFunction
 {
 public:
   PyStudyFunction();

diff --git a/src/cpp/PyStudyJob.hxx b/src/cpp/PyStudyJob.hxx
index 98330951645c25c358d04468de83c7472dd75ad0..25863efe5751ac2f809f7c3a7e17911540fd9230 100644 (file)
--- a/src/cpp/PyStudyJob.hxx
+++ b/src/cpp/PyStudyJob.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef YDEFX_PYSTUDYJOB_HXX
 #define YDEFX_PYSTUDYJOB_HXX
-#include "ydefxExports.hxx"
 #include "Job.hxx"
 #include <py2cpp/PyPtr.hxx>
 
 namespace ydefx
 {
-class YDEFX_EXPORT PyStudyJob : public Job
+class PyStudyJob : public Job
 {
 public:
   PyStudyJob(const std::string& pymodule_name, const std::string& pyclass_name);

diff --git a/src/cpp/Sample.hxx b/src/cpp/Sample.hxx
index 8c70b87da792740997b730d4fe85ee7c414b917b..292150bafbf797e6d7dfcd9ce5bd09494e4f0a34 100644 (file)
--- a/src/cpp/Sample.hxx
+++ b/src/cpp/Sample.hxx
@@ -19,7 +19,6 @@
 #ifndef YDEFX_SAMPLE_H\r
 #define YDEFX_SAMPLE_H\r
 \r
-#include "ydefxExports.hxx"\r
 #include <vector>\r
 #include <string>\r
 #include <list>\r
@@ -29,7 +28,7 @@ namespace ydefx
 {\r
 \r
 template <class T>\r
-class YDEFX_EXPORT VariablesGroup\r
+class VariablesGroup\r
 {\r
 public:\r
   VariablesGroup();\r
@@ -59,10 +58,10 @@ private:
   T _defaultValue;\r
 };\r
 \r
-enum class YDEFX_EXPORT ExecutionState {NOTEXECUTED, DONE, ERROR};\r
+enum class ExecutionState {NOTEXECUTED, DONE, ERROR};\r
 \r
 template <class T>\r
-class YDEFX_EXPORT OneTypeSample\r
+class OneTypeSample\r
 {\r
 public:\r
   const VariablesGroup<T>& inputs()const;\r
@@ -81,7 +80,7 @@ template <class... Ts> class Sample;
 \r
 // no type sample\r
 template <>\r
-class YDEFX_EXPORT Sample<>\r
+class Sample<>\r
 {\r
 public:\r
   const std::vector<std::string>& errors()const{return _errors;}\r
@@ -129,7 +128,7 @@ private:
 \r
 // multi type sample\r
 template <class T, class... Ts>\r
-class YDEFX_EXPORT Sample<T, Ts...> : public OneTypeSample<T>, public Sample<Ts...>\r
+class Sample<T, Ts...> : public OneTypeSample<T>, public Sample<Ts...>\r
 {\r
 public:\r
   virtual ExecutionState pointState(int index);\r

diff --git a/src/cpp/SamplePyConversions.hxx b/src/cpp/SamplePyConversions.hxx
index 8fdeca341f97a88f9131ea079cf016416915f1f5..8ba76427c0501d7a943f46e0920cfbaae0ef054f 100644 (file)
--- a/src/cpp/SamplePyConversions.hxx
+++ b/src/cpp/SamplePyConversions.hxx
@@ -19,7 +19,6 @@
 #ifndef YDEFX_SAMPLEPYCONVERSIONS_HXX
 #define YDEFX_SAMPLEPYCONVERSIONS_HXX
 
-#include "ydefxExports.hxx"
 #include <py2cpp/py2cpp.hxx>
 #include "Sample.hxx"
 #include "Exceptions.hxx"
@@ -34,7 +33,7 @@ namespace ydefx
  *      list of sample types.
  */
 template <class S, class... Ts>
-YDEFX_EXPORT class SamplePyConverter;
+class SamplePyConverter;
 
 /*!
  * Convert input variables of a sample to a python dictionary.
@@ -42,7 +41,7 @@ YDEFX_EXPORT class SamplePyConverter;
  * The returned value is NULL in case of error.
  */
 template <class ...Ts>
-YDEFX_EXPORT PyObject* inputToPy(const Sample<Ts...>& sample);
+PyObject* inputToPy(const Sample<Ts...>& sample);
 
 /*!
  * Fill the input values of the sample from a python dictionary.
@@ -54,7 +53,7 @@ YDEFX_EXPORT PyObject* inputToPy(const Sample<Ts...>& sample);
  * Keys from the python dictionary that do not exist in the sample are ignored.
  */
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& sample);
+py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& sample);
 
 /*!
  * Convert output variables of a sample to a python dictionary.
@@ -65,7 +64,7 @@ YDEFX_EXPORT py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& s
  * The returned value is NULL in case of error.
  */
 template <class ...Ts>
-YDEFX_EXPORT PyObject* outputToPy(const Sample<Ts...>& sample);
+PyObject* outputToPy(const Sample<Ts...>& sample);
 
 /*!
  * Fill the output values of a sample from a python dictionary.
@@ -76,7 +75,7 @@ YDEFX_EXPORT PyObject* outputToPy(const Sample<Ts...>& sample);
  * ignored.
  */
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>& sample);
+py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>& sample);
 
 /*!
  * Fill the error values of a sample from a python list of strings.
@@ -84,7 +83,7 @@ YDEFX_EXPORT py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>&
  * strings.
  */
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>& sample);
+py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>& sample);
 
 /*!
  * Fetch output values and errors from the python objet.
@@ -92,14 +91,14 @@ YDEFX_EXPORT py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>&
  * function is called.
  */
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck fetchResults(PyObject* obj, Sample<Ts...>& sample);
+py2cpp::ConversionCheck fetchResults(PyObject* obj, Sample<Ts...>& sample);
 
 ////////////////////////////////////////////////////////////////////////////////
 // Template implementations
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class S>
-class YDEFX_EXPORT SamplePyConverter<S>
+class SamplePyConverter<S>
 {
 public:
   bool inputToPy(const S& sample, PyObject* result){return true;}
@@ -111,7 +110,7 @@ public:
 };
 
 template <class S, class T, class... Ts>
-class YDEFX_EXPORT SamplePyConverter<S,T, Ts...> : public SamplePyConverter<S, Ts...>
+class SamplePyConverter<S,T, Ts...> : public SamplePyConverter<S, Ts...>
 {
 public:
   /*! Add sample.inputs<T> to result.
@@ -134,7 +133,7 @@ public:
     return ok;
   }
 
-  YDEFX_EXPORT py2cpp::ConversionCheck inputFromPy(PyObject* obj, S& sample)
+  py2cpp::ConversionCheck inputFromPy(PyObject* obj, S& sample)
   {
     py2cpp::ConversionCheck check;
     std::list<std::string> names = sample.OneTypeSample<T>::inputs().names();
@@ -174,7 +173,7 @@ public:
     return check;
   }
 
-  YDEFX_EXPORT bool outputToPy(const S& sample, PyObject* result)
+  bool outputToPy(const S& sample, PyObject* result)
   {
     bool ok = true;
     std::size_t maxsize = sample.maxSize();
@@ -210,7 +209,7 @@ public:
     return ok;
   }
 
-  YDEFX_EXPORT py2cpp::ConversionCheck outputFromPy(PyObject* obj, S& sample)
+  py2cpp::ConversionCheck outputFromPy(PyObject* obj, S& sample)
   {
     py2cpp::ConversionCheck check;
     std::list<std::string> names = sample.OneTypeSample<T>::outputs().names();
@@ -259,7 +258,7 @@ public:
 };
 
 template <class ...Ts>
-YDEFX_EXPORT PyObject* inputToPy(const Sample<Ts...>& sample)
+PyObject* inputToPy(const Sample<Ts...>& sample)
 {
   PyObject * result = PyDict_New();
   if(result)
@@ -276,7 +275,7 @@ YDEFX_EXPORT PyObject* inputToPy(const Sample<Ts...>& sample)
 }
 
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& sample)
+py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& sample)
 {
   py2cpp::ConversionCheck check;
   if(PyDict_Check(obj))
@@ -292,7 +291,7 @@ YDEFX_EXPORT py2cpp::ConversionCheck inputFromPy(PyObject* obj, Sample<Ts...>& s
 }
 
 template <class ...Ts>
-YDEFX_EXPORT PyObject* outputToPy(const Sample<Ts...>& sample)
+PyObject* outputToPy(const Sample<Ts...>& sample)
 {
   PyObject * result = PyDict_New();
   if(result)
@@ -308,7 +307,7 @@ YDEFX_EXPORT PyObject* outputToPy(const Sample<Ts...>& sample)
 }
 
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>& sample)
+py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>& sample)
 {
   py2cpp::ConversionCheck check;
   if(PyDict_Check(obj))
@@ -323,7 +322,7 @@ YDEFX_EXPORT py2cpp::ConversionCheck outputFromPy(PyObject* obj, Sample<Ts...>&
 }
 
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>& sample)
+py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>& sample)
 {
   py2cpp::ConversionCheck check;
   if(PyList_Check(obj))
@@ -348,7 +347,7 @@ YDEFX_EXPORT py2cpp::ConversionCheck errorsFromPy(PyObject* obj, Sample<Ts...>&
 }
 
 template <class ...Ts>
-YDEFX_EXPORT py2cpp::ConversionCheck fetchResults(const py2cpp::PyPtr& obj, Sample<Ts...>& sample)
+py2cpp::ConversionCheck fetchResults(const py2cpp::PyPtr& obj, Sample<Ts...>& sample)
 {
   py2cpp::ConversionCheck check;
   check.addError(outputFromPy(obj.getAttr("_output").get(), sample));

diff --git a/src/cpp/StudyFunction.hxx b/src/cpp/StudyFunction.hxx
index 0486dfb92270fbf0d19bb884440aa3179f3da71a..6816165cbfec9ae62c198d00ad3af1d2e4ac6f51 100644 (file)
--- a/src/cpp/StudyFunction.hxx
+++ b/src/cpp/StudyFunction.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef YDEFX_STUDYFUNCTION_H
 #define YDEFX_STUDYFUNCTION_H
-#include "ydefxExports.hxx"
 #include <string>
 #include <list>
 
 namespace ydefx
 {
-class YDEFX_EXPORT StudyFunction
+class StudyFunction
 {
 public:
   virtual ~StudyFunction(){}

diff --git a/src/cpp/TMonoPyJob.hxx b/src/cpp/TMonoPyJob.hxx
index 8d50f63209506671532560f2e4657a3ad2697757..08a574c355e1f7e903d64617af92adaa4ec105cf 100644 (file)
--- a/src/cpp/TMonoPyJob.hxx
+++ b/src/cpp/TMonoPyJob.hxx
@@ -18,7 +18,6 @@
 //
 #ifndef YDEFX_TMONOPYJOB_HXX
 #define YDEFX_TMONOPYJOB_HXX
-#include "ydefxExports.hxx"
 #include "JobParametersProxy.hxx"
 #include "MonoPyJob.hxx"
 #include "SamplePyConversions.hxx"
@@ -27,7 +26,7 @@
 namespace ydefx
 {
 template <class ...Ts>
-class YDEFX_EXPORT TMonoPyJob : public MonoPyJob
+class TMonoPyJob : public MonoPyJob
 {
 public:
   //! Create a new job.

diff --git a/src/cpp/TPyStudyJob.hxx b/src/cpp/TPyStudyJob.hxx
index 0922d45bd11f250f34f686e8ca9709ef7847e4da..d42ca694331b472b59114167d323e76b0d0103b9 100644 (file)
--- a/src/cpp/TPyStudyJob.hxx
+++ b/src/cpp/TPyStudyJob.hxx
@@ -18,7 +18,6 @@
 //
 #ifndef YDEFX_TPYSTUDYJOB_HXX
 #define YDEFX_TPYSTUDYJOB_HXX
-#include "ydefxExports.hxx"
 #include "JobParametersProxy.hxx"
 #include "PyStudyJob.hxx"
 #include "SamplePyConversions.hxx"
@@ -27,7 +26,7 @@
 namespace ydefx
 {
 template <class ...Ts>
-class YDEFX_EXPORT TPyStudyJob : public PyStudyJob
+class TPyStudyJob : public PyStudyJob
 {
 public:
   //! Create a new job using the default pystudy class.

diff --git a/src/cpp/Test/CMakeLists.txt b/src/cpp/Test/CMakeLists.txt
index 294473332d66d1e56d9b393db63d5d79c319e6f5..a4686a6d03c0abb9af234b9bfebd50809aad3c90 100644 (file)
--- a/src/cpp/Test/CMakeLists.txt
+++ b/src/cpp/Test/CMakeLists.txt
@@ -19,15 +19,25 @@
 FIND_PACKAGE(SalomeCppUnit REQUIRED)
 
 # additional include directories
-INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/..
-)
+SET(_include_DIRECTORIES
+    ${CPPUNIT_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+  )
+IF(WIN32)
+  LIST(APPEND _include_DIRECTORIES ${PY2CPP_ROOT_DIR}/include)
+ENDIF(WIN32)
+
+INCLUDE_DIRECTORIES(${_include_DIRECTORIES})
 
+IF(WIN32)
+ SET(py2cpp_lib ${PY2CPP_ROOT_DIR}/lib/py2cpp.lib)
+ELSE(WIN32)
+ SET(py2cpp_lib py2cpp)
+ENDIF(WIN32)
 # libraries to link to
 SET(_link_LIBRARIES
   ${CPPUNIT_LIBRARIES}
-  py2cpp
+  ${py2cpp_lib}
   ydefx
 )
 

diff --git a/src/cpp/YacsStudyFunction.hxx b/src/cpp/YacsStudyFunction.hxx
index 39389a06d81e0af10e16aa762093d9119e8d8e17..58fd95499091404b02879a759e239251187f8ddc 100644 (file)
--- a/src/cpp/YacsStudyFunction.hxx
+++ b/src/cpp/YacsStudyFunction.hxx
@@ -18,12 +18,11 @@
 //
 #ifndef YDEFX_YACSSTUDYFUNCTION_H
 #define YDEFX_YACSSTUDYFUNCTION_H
-#include "ydefxExports.hxx"
 #include "StudyFunction.hxx"
 namespace ydefx
 {
 //TODO not implemented!
-class YDEFX_EXPORT YacsStudyFunction :  StudyFunction
+class YacsStudyFunction :  StudyFunction
 {
 public:
   YacsStudyFunction();

diff --git a/src/cpp/ydefxExports.hxx b/src/cpp/ydefxExports.hxx
deleted file mode 100644 (file)
index 0ccfaa7..0000000
--- a/src/cpp/ydefxExports.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2021 EDF R&D
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#pragma once
-
-#ifdef WIN32
-#  if defined(ydefx_EXPORTS) || defined(ydefx_EXPORTS)
-#    define YDEFX_EXPORT __declspec( dllexport )
-#  else
-#    define YDEFX_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define YDEFX_EXPORT
-#endif

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index c3babeaf7d6572e2b2204eb2cdbc5307a3cb7994..8774193bd775b143cfa26412c7dfd2a7b288fc1d 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -37,7 +37,6 @@ SET(YDEFXGUI_SOURCES
 
 SET(YDEFXGUI_HEADERS
   ResourceWidget.hxx
-  ydefxguiExports.hxx
 )
 
 SET(YDEFXGUI_link_LIBRARIES

diff --git a/src/gui/ParamsConfig.hxx b/src/gui/ParamsConfig.hxx
index a394d2c36e13e49213d6ec8e7cbf1ee0e3775687..a66ada03a8539e9bdc711ca9102a6f05c4e2eb82 100644 (file)
--- a/src/gui/ParamsConfig.hxx
+++ b/src/gui/ParamsConfig.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef IDEFX_ParamsConfigWidget_HXX
 #define IDEFX_ParamsConfigWidget_HXX
-#include "ydefxguiExports.hxx"
 #include "JobParametersProxy.hxx"
 #include <QtWidgets>
 
 namespace ydefx
 {
-class YDEFXGUI_EXPORT ParamsConfigWidget: public QScrollArea
+class ParamsConfigWidget: public QScrollArea
 {
   Q_OBJECT
 public:

diff --git a/src/gui/PathsConfig.hxx b/src/gui/PathsConfig.hxx
index 918abd5efe88bdb13852c38fae3dd5751e862272..d87247b2eb63af9e869f060a0b57024ea5af247a 100644 (file)
--- a/src/gui/PathsConfig.hxx
+++ b/src/gui/PathsConfig.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef IDEFX_PathsConfigWidget_HXX
 #define IDEFX_PathsConfigWidget_HXX
-#include "ydefxguiExports.hxx"
 #include "JobParametersProxy.hxx"
 #include <QtWidgets>
 
 namespace ydefx
 {
-class YDEFXGUI_EXPORT PathsConfigWidget: public QScrollArea
+class PathsConfigWidget: public QScrollArea
 {
   Q_OBJECT
 public:

diff --git a/src/gui/QuickConfig.hxx b/src/gui/QuickConfig.hxx
index a1ab935ff8b6b5708d11866122f00c7baec2d5b7..8d031a8255421b393e2aa7bb6941abaad8dc287b 100644 (file)
--- a/src/gui/QuickConfig.hxx
+++ b/src/gui/QuickConfig.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef IDEFX_QuickConfigWidget_HXX
 #define IDEFX_QuickConfigWidget_HXX
-#include "ydefxguiExports.hxx"
 #include "JobParametersProxy.hxx"
 #include <QtWidgets>
 
 namespace ydefx
 {
-class YDEFXGUI_EXPORT QuickConfigWidget: public QScrollArea
+class QuickConfigWidget: public QScrollArea
 {
   Q_OBJECT
 public:

diff --git a/src/gui/ResourceWidget.hxx b/src/gui/ResourceWidget.hxx
index bc96557723bb15d9bd43177e8fd9f66b0a11a563..86ea843309a83e7d5ecbf0d53cecf8e94d0d5b64 100644 (file)
--- a/src/gui/ResourceWidget.hxx
+++ b/src/gui/ResourceWidget.hxx
@@ -18,13 +18,12 @@
 //
 #ifndef IDEFX_RESOURCEWIDGET_HXX
 #define IDEFX_RESOURCEWIDGET_HXX
-#include "ydefxguiExports.hxx"
 #include "JobParametersProxy.hxx"
 #include <QtWidgets>
 namespace ydefx
 {
 
-class YDEFXGUI_EXPORT ResourceWidget: public QTabWidget
+class ResourceWidget: public QTabWidget
 {
   Q_OBJECT
 public: