mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-30 16:10:44 +08:00
Added -fno-strict-aliasing to CFLAGS when the compiler supports it and cmake is in use.
This commit is contained in:
parent
a8001f03e1
commit
a89e259431
@ -118,11 +118,6 @@ MACRO(CHECK_C_LINKER_FLAG M_FLAG M_RESULT)
|
|||||||
SET(CMAKE_REQUIRED_FLAGS "${T_REQ_FLAG}")
|
SET(CMAKE_REQUIRED_FLAGS "${T_REQ_FLAG}")
|
||||||
ENDMACRO()
|
ENDMACRO()
|
||||||
|
|
||||||
# Enable 'dist and distcheck'.
|
|
||||||
# File adapted from http://ensc.de/cmake/FindMakeDist.cmake
|
|
||||||
FIND_PACKAGE(MakeDist)
|
|
||||||
# End 'enable dist and distcheck'
|
|
||||||
|
|
||||||
# Set the build type.
|
# Set the build type.
|
||||||
IF(NOT CMAKE_BUILD_TYPE)
|
IF(NOT CMAKE_BUILD_TYPE)
|
||||||
SET(CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None, Debug, Release."
|
SET(CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None, Debug, Release."
|
||||||
@ -199,6 +194,15 @@ ENDIF()
|
|||||||
|
|
||||||
OPTION(NC_FIND_SHARED_LIBS "Find dynamically-built versions of dependent libraries" ${BUILD_SHARED_LIBS})
|
OPTION(NC_FIND_SHARED_LIBS "Find dynamically-built versions of dependent libraries" ${BUILD_SHARED_LIBS})
|
||||||
|
|
||||||
|
##
|
||||||
|
# Check to see if C compiler supports -fno-strict-aliasing, in support of
|
||||||
|
# https://github.com/Unidata/netcdf-c/issues/1983
|
||||||
|
##
|
||||||
|
CHECK_C_COMPILER_FLAG(-fno-strict-aliasing CC_SUPPORTS_NO_STRICT_ALIASING)
|
||||||
|
IF(CC_SUPPORTS_NO_STRICT_ALIASING)
|
||||||
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
|
||||||
|
ENDIF(CC_SUPPORTS_NO_STRICT_ALIASING)
|
||||||
|
|
||||||
##
|
##
|
||||||
# We've had a request to allow for non-versioned shared libraries.
|
# We've had a request to allow for non-versioned shared libraries.
|
||||||
# This seems reasonable enough to accommodate. See
|
# This seems reasonable enough to accommodate. See
|
||||||
@ -2122,9 +2126,6 @@ INSTALL(PROGRAMS ${netCDF_BINARY_DIR}/nc-config
|
|||||||
##
|
##
|
||||||
print_conf_summary()
|
print_conf_summary()
|
||||||
|
|
||||||
# Enable Makedist files.
|
|
||||||
ADD_MAKEDIST()
|
|
||||||
ENABLE_MAKEDIST(README.md COPYRIGHT RELEASE_NOTES.md INSTALL INSTALL.cmake test_prog.c lib_flags.am cmake CMakeLists.txt COMPILE.cmake.txt config.h.cmake.in cmake_uninstall.cmake.in netcdf-config-version.cmake.in netcdf-config.cmake.in FixBundle.cmake.in nc-config.cmake.in configure configure.ac install-sh config.h.in config.sub CTestConfig.cmake.in)
|
|
||||||
|
|
||||||
#####
|
#####
|
||||||
# Configure and print the libnetcdf.settings file.
|
# Configure and print the libnetcdf.settings file.
|
||||||
|
Loading…
Reference in New Issue
Block a user