mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1426 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'f4516d40feb7ea696e228253bc64a94f55296cbb':
  Fix comment
  Update toolchain comment
  Use c99 standard cmake variable
  Add PGI toolchain
This commit is contained in:
Allen Byrne 2019-01-03 14:47:10 -06:00
commit 2a28b92e2b
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -3192,6 +3192,7 @@
./config/toolchain/crayle.cmake
./config/toolchain/GCC.cmake
./config/toolchain/intel.cmake
./config/toolchain/PGI.cmake
./config/cmake/cacheinit.cmake
./config/cmake/CMakeFindJavaCommon.cmake

6
config/cmake/HDFCompilerFlags.cmake
View File

@ -9,16 +9,16 @@
# If you do not have access to either file, you may request a copy from
# help@hdfgroup.org.
#
set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED TRUE)
message (STATUS "Warnings Configuration:")
set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
#-----------------------------------------------------------------------------
# Compiler specific flags : Shouldn't there be compiler tests for these
#-----------------------------------------------------------------------------
if (CMAKE_COMPILER_IS_GNUCC)
set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
if (NOT CYGWIN)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
endif ()
if (${HDF_CFG_NAME} MATCHES "Debug")
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common")

3
config/toolchain/GCC.cmake
View File

@ -1,5 +1,6 @@
# Uncomment the following to use cross-compiling
# Uncomment the following line and the correct system name to use cross-compiling
#set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_COMPILER_VENDOR "GCC")
set(CMAKE_C_COMPILER cc)

11
config/toolchain/PGI.cmake Normal file
View File

@ -0,0 +1,11 @@
# Uncomment the following to use cross-compiling
#set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_COMPILER_VENDOR "PGI")
set(CMAKE_C_COMPILER pgcc)
set(CMAKE_CXX_COMPILER pgc++)
set(CMAKE_Fortran_COMPILER pgf90)
# the following is used if cross-compiling
set(CMAKE_CROSSCOMPILING_EMULATOR "")

3
config/toolchain/crayle.cmake
View File

@ -1,5 +1,6 @@
# Uncomment the following to use cross-compiling
# The following line will use cross-compiling
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
set(CMAKE_C_COMPILER cc)

1
config/toolchain/intel.cmake
View File

@ -1,5 +1,6 @@
# Uncomment the following to use cross-compiling
#set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_COMPILER_VENDOR "intel")
set(CMAKE_C_COMPILER icc)