mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22785] HDFFV-8153: Pull POSIX_C_SOURCE define out to separate variable. Use ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS}) in non-fortran CMakeLists.txt folders

Browse Source 
Tested: jam with intel compilers
This commit is contained in:
Allen Byrne 2012-09-18 17:08:07 -05:00
parent 315ab68bd1
commit eff696a3b0
11 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -955,7 +955,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
IF (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") IF (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs")
SET (release_files SET (release_files
${HDF5_SOURCE_DIR}/release_docs/CMake.txt ${HDF5_SOURCE_DIR}/release_docs/CMake.txt
${HDF5_SOURCE_DIR}/release_docs/Using_CMake.txt ${HDF5_SOURCE_DIR}/release_docs/USING_CMake.txt
${HDF5_SOURCE_DIR}/release_docs/COPYING ${HDF5_SOURCE_DIR}/release_docs/COPYING
${HDF5_SOURCE_DIR}/release_docs/HISTORY-1_9.txt ${HDF5_SOURCE_DIR}/release_docs/HISTORY-1_9.txt
${HDF5_SOURCE_DIR}/release_docs/INSTALL ${HDF5_SOURCE_DIR}/release_docs/INSTALL

5
c++/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_CPP) PROJECT (HDF5_CPP)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Shared/Static Libs # Shared/Static Libs
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
config/cmake/ConfigureChecks.cmake
View File

@ -413,6 +413,7 @@ CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h" H5_HAVE_NETINET_IN_H)
# The linux-lfs option is deprecated. # The linux-lfs option is deprecated.
SET (LINUX_LFS 0) SET (LINUX_LFS 0)
SET (HDF5_EXTRA_C_FLAGS)
SET (HDF5_EXTRA_FLAGS) SET (HDF5_EXTRA_FLAGS)
IF (NOT WINDOWS) IF (NOT WINDOWS)
# Linux Specific flags # Linux Specific flags
@ -422,7 +423,9 @@ IF (NOT WINDOWS)
# correctly. # correctly.
# POSIX feature information can be found in the gcc manual at: # POSIX feature information can be found in the gcc manual at:
# http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
SET (HDF5_EXTRA_FLAGS -D_POSIX_C_SOURCE=199506L -D_BSD_SOURCE) SET (HDF5_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=199506L)
SET (HDF5_EXTRA_FLAGS -D_BSD_SOURCE)
OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
IF (HDF5_ENABLE_LARGE_FILE) IF (HDF5_ENABLE_LARGE_FILE)
SET (msg "Performing TEST_LFS_WORKS") SET (msg "Performing TEST_LFS_WORKS")

5
examples/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_EXAMPLES) PROJECT (HDF5_EXAMPLES)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Define Sources # Define Sources
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
hl/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_HL C CXX) PROJECT (HDF5_HL C CXX)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Shared Libs # Shared Libs
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
perform/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_PERFORM ) PROJECT (HDF5_PERFORM )
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup include Directories # Setup include Directories
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
src/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_SRC C CXX) PROJECT (HDF5_SRC C CXX)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# List Source Files # List Source Files
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
test/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_TEST) PROJECT (HDF5_TEST)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Define Sources # Define Sources
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
testpar/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_TEST_PAR) PROJECT (HDF5_TEST_PAR)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib ) INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
tools/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_TOOLS) PROJECT (HDF5_TOOLS)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup include Directories # Setup include Directories
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

5
tools/lib/CMakeLists.txt
View File

@ -1,6 +1,11 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
PROJECT (HDF5_TOOLS_LIB) PROJECT (HDF5_TOOLS_LIB)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Define Sources # Define Sources
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------