diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-16 21:12:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-17 16:58:05 (GMT) |
| commit | ac8a1f02ab5cb260f23acbe865090033a0183303 (patch) | |
| tree | 53a183ca1de46c0e7ca318faec0953d0fcacaed0 /config | |
| parent | 741ef0aaefb64ead937d86c5e30c9fbc97f69597 (diff) | |
| download | hdf5-ac8a1f02ab5cb260f23acbe865090033a0183303.zip hdf5-ac8a1f02ab5cb260f23acbe865090033a0183303.tar.gz hdf5-ac8a1f02ab5cb260f23acbe865090033a0183303.tar.bz2 | |
Add missing target root path, check other export macro
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/CTestScript.cmake | 5 | ||||
| -rw-r--r-- | config/toolchain/mingw64.cmake | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake index a5527c3..e819e58 100644 --- a/config/cmake/CTestScript.cmake +++ b/config/cmake/CTestScript.cmake @@ -101,6 +101,11 @@ endif () include (ProcessorCount) ProcessorCount (N) if (NOT N EQUAL 0) + if (MAX_PROC_COUNT) + if (N GREATER MAX_PROC_COUNT) + set (N ${MAX_PROC_COUNT}) + endif () + endif () if (NOT WIN32) set (CTEST_BUILD_FLAGS -j${N}) endif () diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake index ad0fb85..721c39a 100644 --- a/config/toolchain/mingw64.cmake +++ b/config/toolchain/mingw64.cmake @@ -3,7 +3,7 @@ set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran) -set (CMAKE_FIND_ROOT_PATH ) +set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |