mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-25 21:40:33 +05:00
fixes for Intel Compiler on Windows
This commit is contained in:
parent
6a2bb86526
commit
11ac6c704a
@ -188,6 +188,12 @@ if (USE_PYTHON)
|
|||||||
endif(NOT Boost_LIBRARIES)
|
endif(NOT Boost_LIBRARIES)
|
||||||
|
|
||||||
add_definitions(-DNG_PYTHON)
|
add_definitions(-DNG_PYTHON)
|
||||||
|
|
||||||
|
if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
|
||||||
|
# fix problems with boosts config/auto_link.hpp
|
||||||
|
add_definitions(-DBOOST_LIB_TOOLSET="iw")
|
||||||
|
endif()
|
||||||
|
|
||||||
include_directories(${PYTHON_INCLUDE_DIRS})
|
include_directories(${PYTHON_INCLUDE_DIRS})
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
set(PYTHON_LIBS "${PYTHON_LIBRARIES};${Boost_LIBRARIES}")
|
set(PYTHON_LIBS "${PYTHON_LIBRARIES};${Boost_LIBRARIES}")
|
||||||
|
@ -76,8 +76,8 @@ protected:
|
|||||||
gzstreambuf buf;
|
gzstreambuf buf;
|
||||||
public:
|
public:
|
||||||
gzstreambase() { init(&buf); }
|
gzstreambase() { init(&buf); }
|
||||||
gzstreambase( const char* name, int open_mode);
|
DLL_HEADER gzstreambase( const char* name, int open_mode);
|
||||||
~gzstreambase();
|
DLL_HEADER ~gzstreambase();
|
||||||
void open( const char* name, int open_mode);
|
void open( const char* name, int open_mode);
|
||||||
void close();
|
void close();
|
||||||
gzstreambuf* rdbuf() { return &buf; }
|
gzstreambuf* rdbuf() { return &buf; }
|
||||||
|
@ -586,7 +586,7 @@ namespace netgen
|
|||||||
flagstruct flags;
|
flagstruct flags;
|
||||||
|
|
||||||
///
|
///
|
||||||
Element ();
|
DLL_HEADER Element ();
|
||||||
///
|
///
|
||||||
Element (int anp);
|
Element (int anp);
|
||||||
///
|
///
|
||||||
|
@ -24,12 +24,12 @@ namespace netgen
|
|||||||
int changeval;
|
int changeval;
|
||||||
static DLL_HEADER GLdouble backcolor;
|
static DLL_HEADER GLdouble backcolor;
|
||||||
|
|
||||||
static int selface;
|
static int DLL_HEADER selface;
|
||||||
static int selelement;
|
static int selelement;
|
||||||
static int selpoint;
|
static int DLL_HEADER selpoint;
|
||||||
static int selpoint2;
|
static int selpoint2;
|
||||||
static int locpi;
|
static int locpi;
|
||||||
static int seledge;
|
static int DLL_HEADER seledge;
|
||||||
|
|
||||||
static int selecttimestamp;
|
static int selecttimestamp;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user