File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed
Modules/ThirdParty/VNL/src/vxl
config/cmake/config/vxl_shared_link_test Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 1313#
14141515
16- cmake_minimum_required (VERSION 3.10.2...3.20.3 )
16+ cmake_minimum_required (VERSION 3.10.2...3.31.9 )
1717if (CMAKE_VERSION VERSION_LESS 3.12.0)
1818 cmake_policy (VERSION ${CMAKE_VERSION} )
19+ else ()
20+ cmake_policy (VERSION 3.10.2...3.31.9)
1921endif ()
2022
2123if (NOT CMAKE_CXX_STANDARD)
Original file line number Diff line number Diff line change 44# Set policies consistent with newer versions of cmake
55# to ease integration with projects that require newer
66# cmake versions.
7- cmake_minimum_required (VERSION 3.10.2)
7+ cmake_minimum_required (VERSION 3.10.2...3.31.9 )
88if (CMAKE_VERSION VERSION_LESS 3.12.0)
99 cmake_policy (VERSION ${CMAKE_VERSION} )
1010else ()
11- cmake_policy (VERSION 3.10.2...3.13.2 )
11+ cmake_policy (VERSION 3.10.2...3.31.9 )
1212endif ()
1313
1414project (vxl_pic_compatible)
Original file line number Diff line number Diff line change @@ -205,10 +205,11 @@ struct VNL_EXPORT vnl_complex_traits<std::complex<vnl_bignum>>
205205 {
206206 isreal = false
207207 };
208- static std::complex <vnl_bignum >
208+ static std::complex <float >
209209 conjugate (std::complex <vnl_bignum> x)
210210 {
211- return std::complex <vnl_bignum>(x.real (), -x.imag ());
211+ throw std::runtime_error (" Can not call complexify on non floating point data type" );
212+ return std::complex <float >(0 ., 0 .);
212213 }
213214 static std::complex <float >
214215 complexify (std::complex <float > /* x */ )
You can’t perform that action at this time.
0 commit comments