diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 20:46:48 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 20:46:48 (GMT) |
| commit | 038a560da9c7eb61345c0cd21d419247a84e28aa (patch) | |
| tree | be593071d2119139d92008719c6c031fcfe68602 | |
| parent | 7f797174c7a013359e94d1aa5d6540a5629aa550 (diff) | |
| download | hdf5-038a560da9c7eb61345c0cd21d419247a84e28aa.zip hdf5-038a560da9c7eb61345c0cd21d419247a84e28aa.tar.gz hdf5-038a560da9c7eb61345c0cd21d419247a84e28aa.tar.bz2 | |
Address merge anomalies and incorrect file permissions.
| -rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 22 | ||||
| -rw-r--r-- | config/intel.cmake | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | release_docs/HISTORY-1_10.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | release_docs/INSTALL | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | release_docs/INSTALL_Cygwin.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | release_docs/INSTALL_parallel | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | release_docs/RELEASE.txt | 0 |
7 files changed, 0 insertions, 32 deletions
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 2bfa9c3..24eaf78 100755 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -85,23 +85,6 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_HL_LIB:BOOL=OFF") ############################################################################################# -### enable parallel builds - -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON") -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF”) -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF”) -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF”) - -############################################################################################# -### enable thread-safety builds - -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=ON”) -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=OFF") -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF”) -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF”) -#set(ADD_BUILD_OPTIONS “${ADD_BUILD_OPTIONS} -DHDF5_BUILD_HL_LIB:BOOL=OFF”) - -############################################################################################# ### disable test program builds #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF") @@ -119,8 +102,3 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake") ############################################################################################# -### use a toolchain file - -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/intel.cmake") - -############################################################################################# diff --git a/config/intel.cmake b/config/intel.cmake deleted file mode 100644 index f1a5734..0000000 --- a/config/intel.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# Uncomment the following to use cross-compiling -#set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_COMPILER_VENDOR "intel") - -set(CMAKE_C_COMPILER icc) -set(CMAKE_CXX_COMPILER icpc) -set(CMAKE_Fortran_COMPILER ifort) - -# the following is used if cross-compiling -set(CMAKE_CROSSCOMPILING_EMULATOR "") diff --git a/release_docs/HISTORY-1_10.txt b/release_docs/HISTORY-1_10.txt index ad8beb2..ad8beb2 100755..100644 --- a/release_docs/HISTORY-1_10.txt +++ b/release_docs/HISTORY-1_10.txt diff --git a/release_docs/INSTALL b/release_docs/INSTALL index 5c54698..5c54698 100755..100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt index 74f494c..74f494c 100755..100644 --- a/release_docs/INSTALL_Cygwin.txt +++ b/release_docs/INSTALL_Cygwin.txt diff --git a/release_docs/INSTALL_parallel b/release_docs/INSTALL_parallel index d3d7830..d3d7830 100755..100644 --- a/release_docs/INSTALL_parallel +++ b/release_docs/INSTALL_parallel diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 2192811..2192811 100755..100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt |