Skip to content
Snippets Groups Projects
Commit dd923344 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Attempt (failed) to cure bug with PolarizedDWBAZeroMagField under windows.

parent 86081f82
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ set(BornAgain_VERSION_PATCH 3)
# --- General project settings ---
option(BORNAGAIN_PYTHON "Build with python support" ON)
option(BORNAGAIN_APP "Build test application" ON)
option(BORNAGAIN_APP "Build test application" OFF)
option(BORNAGAIN_GUI "Build a graphical user interface" OFF)
option(BORNAGAIN_MAN "Build a user manual" OFF)
option(BUILD_DEBIAN "Build a debian package" OFF)
......
......@@ -27,10 +27,10 @@
class BA_CORE_API_ Beam : public IParameterized
{
public:
#ifndef GCCXML_SKIP_THIS
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
#endif
// see http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
//#ifndef GCCXML_SKIP_THIS
// EIGEN_MAKE_ALIGNED_OPERATOR_NEW
//#endif
// // see http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
Beam();
Beam(const Beam& other);
......
......@@ -24,12 +24,12 @@
//! See also issue with POSIX_ADVISORY_INFO at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=554
#ifndef GCCXML_SKIP_THIS
//#ifdef _WIN32
#ifdef _WIN32
//#define EIGEN_DONT_ALIGN_STATICALLY 1
//#define EIGEN_DONT_ALIGN 1
#define EIGEN_DONT_ALIGN 1
//#define EIGEN_DONT_VECTORIZE 1
//#define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT 1
//#endif
#endif
#ifndef _WIN32
#include <unistd.h>
#endif
......
set(BORNAGAIN_ARCHITECTURE win32)
set(BORNAGAIN_PLATFORM win32)
add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1)
message(STATUS "Disabling static align for Eigen")
#add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1)
#message(STATUS "Disabling static align for Eigen")
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP -nologo /EHsc -I${CMAKE_SOURCE_DIR}/Core/Tools/inc -FIw32pragma.h -FIWinDllMacros.h")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment