diff --git a/Makefile b/Makefile index 2a3c37a7..21e99194 100644 --- a/Makefile +++ b/Makefile @@ -474,6 +474,7 @@ build-only-$(1)_$(3): TARGET = $(3) build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) +build-only-$(1)_$(3): CMAKE_RUNRESULT_FILE = $(PREFIX)/share/cmake/modules/TryRunResults.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_DIR = $(PREFIX)/$(3)/share/cmake/mxe-conf.d build-only-$(1)_$(3): CMAKE_STATIC_BOOL = $(if $(findstring shared,$(3)),OFF,ON) diff --git a/src/cmake/modules/TryRunResults.cmake b/src/cmake/modules/TryRunResults.cmake new file mode 100644 index 00000000..0b9516d9 --- /dev/null +++ b/src/cmake/modules/TryRunResults.cmake @@ -0,0 +1,156 @@ +SET( KWSYS_CHAR_IS_SIGNED + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_SLICED_DESTRUCTOR_BUG + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_SLICED_DESTRUCTOR_BUG__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_WORKING_STRINGSTREAM + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_WORKING_STRINGSTREAM__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_LFS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_LFS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_COMPLEX_POW_WORKS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_COMPLEX_POW_WORKS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_CHAR_IS_SIGNED + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_CHAR_IS_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_NUMERIC_LIMITS_HAS_INFINITY + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_NUMERIC_LIMITS_HAS_INFINITY__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_PROCESSOR_HAS_INFINITY + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_PROCESSOR_HAS_INFINITY__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( QNANHIBIT_VALUE + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( QNANHIBIT_VALUE__TRYRUN_OUTPUT + "-DTEEM_QNANHIBIT=1" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( KWSYS_LFS_WORKS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VXL_HAS_SSE2_HARDWARE_SUPPORT + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VXL_HAS_SSE2_HARDWARE_SUPPORT__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS__TRYRUN_OUTPUT + "89255.0/1e22 = 8.9255e-018" + CACHE STRING "Output from TRY_RUN" FORCE) +set( HDF5_PRINTF_LL_TEST_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( HDF5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT + "PRINTF_LL_WIDTH=[I64]" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_INTEGER_WORKS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_INTEGER_WORKS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULONG_TO_FLOAT_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULONG_TO_FLOAT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_UINT_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_UINT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_NO_ALIGNMENT_RESTRICTIONS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( C_CHAR_SIGNED + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( C_CHAR_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 082c0ade..57fd890d 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -56,7 +56,10 @@ define $(PKG)_BUILD echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" "$$@"'; \ echo 'else'; \ echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ - echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ + echo ' echo "== Using MXE runresult: $(CMAKE_RUNRESULT_FILE)"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \ + -C"$(CMAKE_RUNRESULT_FILE)" "$$@"'; \ echo 'fi'; \ ) \ > '$(PREFIX)/bin/$(TARGET)-cmake'