summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-05-16 23:21:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-05-16 23:21:25 (GMT)
commit7e5dd96e1fb047dd97826e7df3d015f0d7f76364 (patch)
tree09cca859fc02cc9d6bb3c92884f73344153757e7 /config
parent685be0fddb6991a9fc3e3b188add0174191738c8 (diff)
parent1be2797e2c438a8c99dc1665460912e8bc2ddcf0 (diff)
downloadhdf5-7e5dd96e1fb047dd97826e7df3d015f0d7f76364.zip
hdf5-7e5dd96e1fb047dd97826e7df3d015f0d7f76364.tar.gz
hdf5-7e5dd96e1fb047dd97826e7df3d015f0d7f76364.tar.bz2
Merge pull request #2584 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '1be2797e2c438a8c99dc1665460912e8bc2ddcf0': Correct mingw paths Correct mingw path
Diffstat (limited to 'config')
-rw-r--r--config/toolchain/build32.cmake16
-rw-r--r--config/toolchain/mingw64.cmake4
2 files changed, 12 insertions, 8 deletions
diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
index 207d03e..a2566c3 100644
--- a/config/toolchain/build32.cmake
+++ b/config/toolchain/build32.cmake
@@ -5,10 +5,11 @@ elseif(APPLE)
set (CMAKE_OSX_ARCHITECTURES "i386")
elseif(MINGW)
set (CMAKE_SYSTEM_NAME Windows)
- set (CMAKE_C_COMPILER i686-w64-mingw32-gcc)
- set (CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
- set (CMAKE_RC_COMPILER i686-w64-mingw32-windres)
- set (CMAKE_Fortran_COMPILER i686-w64-mingw32-gfortran)
+ set (TOOLCHAIN_PREFIX i686-w64-mingw32)
+ set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+ set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+ set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+ set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
@@ -34,11 +35,14 @@ elseif(MINGW)
set (ENV{PKG_CONFIG_LIBDIR} ${LIB32}/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig)
endif ()
- set (CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
+ set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
- set (CMAKE_CROSSCOMPILING_EMULATOR wine32)
+ set (CMAKE_CROSSCOMPILING_EMULATOR wine)
+
+ include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
else ()
set (CMAKE_SYSTEM_NAME Linux)
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
index fde5e38..1830488 100644
--- a/config/toolchain/mingw64.cmake
+++ b/config/toolchain/mingw64.cmake
@@ -4,11 +4,11 @@ set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
-set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/local/${TOOLCHAIN_PREFIX})
+set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
-include_directories(/usr/local/${TOOLCHAIN_PREFIX}/include)
+include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")