Commit 452611c4 authored by Clinton Stimpson's avatar Clinton Stimpson
Browse files

COMP: Remove -DPARAVIEW_BUILD_SHARED_LIBS compile flag when building shared.

      Put all necessary defines for dll import/export in configured header
      files.
parent 89284742
...@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _QtTestingConfigure_h #ifndef _QtTestingConfigure_h
#define _QtTestingConfigure_h #define _QtTestingConfigure_h
#cmakedefine QTTESTING_BUILD_SHARED_LIBS
#cmakedefine QT_TESTING_WITH_XML #cmakedefine QT_TESTING_WITH_XML
#cmakedefine QT_TESTING_WITH_PYTHON #cmakedefine QT_TESTING_WITH_PYTHON
......
...@@ -33,7 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -33,7 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _QtTestingExport_h #ifndef _QtTestingExport_h
#define _QtTestingExport_h #define _QtTestingExport_h
#if defined(WIN32) && defined(PARAVIEW_BUILD_SHARED_LIBS) #include "QtTestingConfigure.h"
#if defined(WIN32) && defined(QTTESTING_BUILD_SHARED_LIBS)
# if defined(QtTesting_EXPORTS) # if defined(QtTesting_EXPORTS)
# define QTTESTING_EXPORT __declspec(dllexport) # define QTTESTING_EXPORT __declspec(dllexport)
# else # else
...@@ -44,3 +46,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -44,3 +46,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#endif // !_QtTestingExport_h #endif // !_QtTestingExport_h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment