diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-03-01 01:06:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 01:06:31 (GMT) |
| commit | 197966eb9f46edfa4e837a3308a8fa776dd65014 (patch) | |
| tree | fb5fd8885f4d1d14b2da3382366ea7671c12a3dd /config/toolchain | |
| parent | d8fd9c2f79ad0aceb0b55b33b7480a4063b8cf08 (diff) | |
| download | hdf5-197966eb9f46edfa4e837a3308a8fa776dd65014.zip hdf5-197966eb9f46edfa4e837a3308a8fa776dd65014.tar.gz hdf5-197966eb9f46edfa4e837a3308a8fa776dd65014.tar.bz2 | |
1.14 Add fetchcontent for compression libs and fix cmake config #2487 (#2492)
* Add fetchcontent for compression libs and fix cmake config #2487
* Update cmake doc for FetchContent
* Add CI test for FetchContent
* Use LINK_COMP_LIBS instead of STATIC_LIBRARY for depends
Diffstat (limited to 'config/toolchain')
| -rw-r--r-- | config/toolchain/GCC.cmake | 11 | ||||
| -rw-r--r-- | config/toolchain/aarch64.cmake | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/config/toolchain/GCC.cmake b/config/toolchain/GCC.cmake deleted file mode 100644 index c41d0ca..0000000 --- a/config/toolchain/GCC.cmake +++ /dev/null @@ -1,11 +0,0 @@ -# Uncomment the following line and the correct system name to use cross-compiling -#set(CMAKE_SYSTEM_NAME Linux) - -set(CMAKE_COMPILER_VENDOR "GCC") - -set(CMAKE_C_COMPILER cc) -set(CMAKE_CXX_COMPILER c++) -set(CMAKE_Fortran_COMPILER gfortran) - -# the following is used if cross-compiling -set(CMAKE_CROSSCOMPILING_EMULATOR "") diff --git a/config/toolchain/aarch64.cmake b/config/toolchain/aarch64.cmake index adb8639..aa84a74 100644 --- a/config/toolchain/aarch64.cmake +++ b/config/toolchain/aarch64.cmake @@ -1,5 +1,5 @@ set(TOOLCHAIN_PREFIX aarch64-linux-gnu) -set(ANDROID_NDK /opt/android-ndk-r25b-linux/android-ndk-r25b) +set(ANDROID_NDK /opt/android-ndk-linux) set (CMAKE_SYSTEM_NAME Android) set (CMAKE_ANDROID_ARCH_ABI x86_64) #set (CMAKE_ANDROID_STANDALONE_TOOLCHAIN ${ANDROID_NDK}/build/cmake/andriod.toolchain.cmake) |