From 038a560da9c7eb61345c0cd21d419247a84e28aa Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 28 Feb 2019 14:46:48 -0600 Subject: Address merge anomalies and incorrect file permissions. --- config/cmake/scripts/HDF5options.cmake | 22 ---------------------- config/intel.cmake | 10 ---------- release_docs/HISTORY-1_10.txt | 0 release_docs/INSTALL | 0 release_docs/INSTALL_Cygwin.txt | 0 release_docs/INSTALL_parallel | 0 release_docs/RELEASE.txt | 0 7 files changed, 32 deletions(-) delete mode 100644 config/intel.cmake mode change 100755 => 100644 release_docs/HISTORY-1_10.txt mode change 100755 => 100644 release_docs/INSTALL mode change 100755 => 100644 release_docs/INSTALL_Cygwin.txt mode change 100755 => 100644 release_docs/INSTALL_parallel mode change 100755 => 100644 release_docs/RELEASE.txt 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 old mode 100755 new mode 100644 diff --git a/release_docs/INSTALL b/release_docs/INSTALL old mode 100755 new mode 100644 diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt old mode 100755 new mode 100644 diff --git a/release_docs/INSTALL_parallel b/release_docs/INSTALL_parallel old mode 100755 new mode 100644 diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt old mode 100755 new mode 100644 -- cgit v0.12