From 8304f59d09d4757724742cd466961288cbc24409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 17 Apr 2017 14:39:55 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@396 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 1 + src/math/pimathcomplex.h | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 901f9e79..3468192d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,7 @@ endif() # Check if PIP support fftw3 for PIFFT using in math module if(FFTW) message(STATUS "Building with fftw3 support") +# find_library(${fftw3} ${LIB_}) add_definitions(-DPIP_FFTW) if(WIN32) add_definitions(-DPIP_FFTW_THREADSAFE) diff --git a/src/math/pimathcomplex.h b/src/math/pimathcomplex.h index 085d47c6..e6370711 100644 --- a/src/math/pimathcomplex.h +++ b/src/math/pimathcomplex.h @@ -11,15 +11,17 @@ using std::complex; typedef complex complexi; typedef complex complexf; -typedef complex complexd; typedef complex complexld; +#ifndef QPIEVALUATOR_COMPLEX +typedef complex complexd; -const complexld complexld_i(0., 1.); -const complexld complexld_0(0.); -const complexld complexld_1(1.); const complexd complexd_i(0., 1.); const complexd complexd_0(0.); const complexd complexd_1(1.); +#endif +const complexld complexld_i(0., 1.); +const complexld complexld_0(0.); +const complexld complexld_1(1.); __PICONTAINERS_SIMPLE_TYPE__(complexi) __PICONTAINERS_SIMPLE_TYPE__(complexf)