philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r21418] Change windows default driver to SEC2

Browse Source 
Add option to allow -fPIC
This commit is contained in:
Allen Byrne
2011-09-26 09:04:15 -05:00
parent 3c51dc92f4
commit a07004c825
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -286,6 +286,17 @@ IF (BUILD_STATIC_EXECS)
ENDIF (NOT WIN32) ENDIF (NOT WIN32)
ENDIF (BUILD_STATIC_EXECS) ENDIF (BUILD_STATIC_EXECS)
#-----------------------------------------------------------------------------
# Option to Build Static PIC
#-----------------------------------------------------------------------------
OPTION (BUILD_STATIC_PIC "Build Static PIC" OFF)
IF (BUILD_STATIC_PIC)
IF (NOT WIN32)
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
ENDIF (NOT WIN32)
ENDIF (BUILD_STATIC_PIC)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Option to use code coverage # Option to use code coverage
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

4
config/cmake/ConfigureChecks.cmake
View File

@@ -159,11 +159,9 @@ IF (WINDOWS)
# #
SET (H5_HAVE_WINDOW_PATH 1) SET (H5_HAVE_WINDOW_PATH 1)
SET (WINDOWS_MAX_BUF (1024 * 1024 * 1024)) SET (WINDOWS_MAX_BUF (1024 * 1024 * 1024))
SET (H5_DEFAULT_VFD H5FD_WINDOWS)
SET (LINK_LIBS ${LINK_LIBS} "kernel32") SET (LINK_LIBS ${LINK_LIBS} "kernel32")
ELSE (WINDOWS)
SET (H5_DEFAULT_VFD H5FD_SEC2)
ENDIF (WINDOWS) ENDIF (WINDOWS)
SET (H5_DEFAULT_VFD H5FD_SEC2)
IF (WINDOWS) IF (WINDOWS)
SET (H5_HAVE_IO_H 1) SET (H5_HAVE_IO_H 1)

2
config/cmake/H5pubconf.h.in
View File

@@ -791,4 +791,4 @@
#undef inline #undef inline
#endif #endif
#endif #endif

2
windows/src/H5pubconf.h
View File

@@ -41,7 +41,7 @@
#define H5_CXX_HAVE_OFFSETOF 1 #define H5_CXX_HAVE_OFFSETOF 1
/* Define the default virtual file driver to compile */ /* Define the default virtual file driver to compile */
#define H5_DEFAULT_VFD H5FD_WINDOWS #define H5_DEFAULT_VFD H5FD_SEC2
/* Define if `dev_t' is a scalar */ /* Define if `dev_t' is a scalar */
#define H5_DEV_T_IS_SCALAR 1 #define H5_DEV_T_IS_SCALAR 1