Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 1b4fadf550587b46e405d7ccb777dcb00aa791a2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 29 Jan 2019 15:39:15 +0800 |
| 4 | Subject: [PATCH 1/2] cross compiling support |
| 5 | |
| 6 | Do not generate config files at build time, use pre-generated |
| 7 | files to instead. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | CMakeLists.txt | 6 ++++++ |
| 14 | src/CMakeLists.txt | 23 ----------------------- |
| 15 | 2 files changed, 6 insertions(+), 23 deletions(-) |
| 16 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | --- a/CMakeLists.txt |
| 18 | +++ b/CMakeLists.txt |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 19 | @@ -770,4 +770,10 @@ endif () |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 20 | #----------------------------------------------------------------------------- |
| 21 | configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) |
| 22 | |
| 23 | +#----------------------------------------------------------------------------- |
| 24 | +# Copy the pre-generated files in place |
| 25 | +#----------------------------------------------------------------------------- |
| 26 | +configure_file(H5Tinit.c H5Tinit.c COPYONLY) |
| 27 | +configure_file(H5lib_settings.c H5lib_settings.c COPYONLY) |
| 28 | + |
| 29 | include (CMakeInstallation.cmake) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 30 | --- a/src/CMakeLists.txt |
| 31 | +++ b/src/CMakeLists.txt |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 32 | @@ -613,36 +613,9 @@ set (H5_PRIVATE_HEADERS |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 33 | #----------------------------------------------------------------------------- |
| 34 | add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) |
| 35 | TARGET_C_PROPERTIES (H5detect STATIC " " " ") |
| 36 | -if (MSVC OR MINGW) |
| 37 | - target_link_libraries (H5detect "ws2_32.lib") |
| 38 | -endif () |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 39 | -if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") |
| 40 | - set_property(TARGET H5detect PROPERTY LINK_FLAGS "-O0") |
| 41 | -endif () |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 43 | -add_custom_command ( |
| 44 | - OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 45 | - COMMAND $<TARGET_FILE:H5detect> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 46 | - ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c |
| 47 | - DEPENDS H5detect |
| 48 | -) |
| 49 | |
| 50 | add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) |
| 51 | TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") |
| 52 | -if (MSVC OR MINGW) |
| 53 | - target_link_libraries (H5make_libsettings "ws2_32.lib") |
| 54 | -endif () |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 55 | -if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") |
| 56 | - set_property(TARGET H5make_libsettings PROPERTY LINK_FLAGS "-O0") |
| 57 | -endif () |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 58 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 59 | -add_custom_command ( |
| 60 | - OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 61 | - COMMAND $<TARGET_FILE:H5make_libsettings> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 62 | - ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c |
| 63 | - DEPENDS H5make_libsettings |
| 64 | - WORKING_DIRECTORY ${HDF5_BINARY_DIR} |
| 65 | -) |
| 66 | |
| 67 | if (GENERATE_ERROR_HEADERS) |
| 68 | find_package (Perl) |