diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2024-04-09 12:25:07 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2024-04-09 13:02:03 +0200 |
| commit | 56a2a58ed6347c2b00c4842c128561e201b32322 (patch) | |
| tree | a200c336da4ed071ab0a0cf123acf022d7a1c0d1 | |
| parent | 99834e93c02097404f5cd5a928346455b7df6e5c (diff) | |
| download | logdiag-56a2a58ed6347c2b00c4842c128561e201b32322.tar.gz logdiag-56a2a58ed6347c2b00c4842c128561e201b32322.tar.xz logdiag-56a2a58ed6347c2b00c4842c128561e201b32322.zip | |
Enable cross-compiled tests
test-diagram still fails, however let's make our toolchain files
a good reference.
| -rw-r--r-- | ToolchainCrossMinGW.cmake | 5 | ||||
| -rw-r--r-- | ToolchainCrossMinGWW64.cmake | 5 | ||||
| -rw-r--r-- | ToolchainCrossWin64.cmake | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ToolchainCrossMinGW.cmake b/ToolchainCrossMinGW.cmake index 7c9242b..4aaa387 100644 --- a/ToolchainCrossMinGW.cmake +++ b/ToolchainCrossMinGW.cmake @@ -5,12 +5,11 @@ set (CMAKE_C_COMPILER "i586-mingw32msvc-gcc") set (CMAKE_CXX_COMPILER "i586-mingw32msvc-g++") set (CMAKE_RC_COMPILER "i586-mingw32msvc-windres") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine") +# Remember to set WINEPATH for library dependencies +set (CMAKE_CROSSCOMPILING_EMULATOR "wine") set (CMAKE_FIND_ROOT_PATH "/usr/i586-mingw32msvc") set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - diff --git a/ToolchainCrossMinGWW64.cmake b/ToolchainCrossMinGWW64.cmake index f72e903..886df14 100644 --- a/ToolchainCrossMinGWW64.cmake +++ b/ToolchainCrossMinGWW64.cmake @@ -5,12 +5,11 @@ set (CMAKE_C_COMPILER "i686-w64-mingw32-gcc") set (CMAKE_CXX_COMPILER "i686-w64-mingw32-g++") set (CMAKE_RC_COMPILER "i686-w64-mingw32-windres") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine") +# Remember to set WINEPATH for library dependencies +set (CMAKE_CROSSCOMPILING_EMULATOR "wine") set (CMAKE_FIND_ROOT_PATH "/usr/i686-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) - diff --git a/ToolchainCrossWin64.cmake b/ToolchainCrossWin64.cmake index 5550d6d..e895c2d 100644 --- a/ToolchainCrossWin64.cmake +++ b/ToolchainCrossWin64.cmake @@ -5,12 +5,11 @@ 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") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine64") +# Remember to set WINEPATH for library dependencies +set (CMAKE_CROSSCOMPILING_EMULATOR "wine64") 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) - |