Trying to fix on amd64/FreeBSD-6:

- Teach about amd64, to detect Not a Number flag, thus enabling Qhull
  support with CSA;

- Disable detection of f77 by cmake unless WITH_FORTRAN is defined.

Reported by:	pointyhat via Pav
This commit is contained in:
Thierry Thomas 2009-12-30 22:50:25 +00:00
parent ee98532506
commit 81a619599c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=246900
2 changed files with 14 additions and 1 deletions

View file

@ -58,7 +58,7 @@ USE_FORTRAN= yes
CONFIGURE_ENV+= CMAKE_Fortran_COMPILER=${FC}
PLIST_SUB+= FORTRAN=""
.else
CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF
CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
PLIST_SUB+= FORTRAN="@comment "
.endif

View file

@ -0,0 +1,13 @@
--- cmake/modules/csiro.cmake.orig 2009-09-06 21:04:43.000000000 +0200
+++ cmake/modules/csiro.cmake 2009-12-30 21:10:58.000000000 +0100
@@ -36,6 +36,10 @@
else(CMAKE_C_COMPILER MATCHES "gcc")
set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
endif(CMAKE_C_COMPILER MATCHES "gcc")
+ else(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
+ set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86")
if(NOT DEFINED NaNAwareCCompiler)