From ff179ee3a48a912217116560244d77a7a50c437b Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Mon, 5 Sep 2022 16:19:59 +0200 Subject: [PATCH] Specify 32 bit SSL --- build.sh | 6 ++---- toolchain-lin-32.cmake | 15 +++++++++++++++ toolchain-lin.cmake => toolchain-lin-64.cmake | 0 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 toolchain-lin-32.cmake rename toolchain-lin.cmake => toolchain-lin-64.cmake (100%) diff --git a/build.sh b/build.sh index f952a70..1008cac 100755 --- a/build.sh +++ b/build.sh @@ -11,12 +11,10 @@ case $1 in cmake -DDEBUG=$DEBUG -DCMAKE_TOOLCHAIN_FILE=../toolchain-mac.cmake .. ;; "lin32") - cmake -DDEBUG=$DEBUG -DBIT=32 -DCMAKE_TOOLCHAIN_FILE=../toolchain-lin.cmake .. - \cp -rf ../openSSL/lin32/*.so* Plugin/GAConnector/32/ + cmake -DDEBUG=$DEBUG -DBIT=32 -DCMAKE_TOOLCHAIN_FILE=../toolchain-lin-32.cmake .. ;; "lin64") - cmake -DDEBUG=$DEBUG -DBIT=64 -DCMAKE_TOOLCHAIN_FILE=../toolchain-lin.cmake .. - \cp -rf ../openSSL/lin64/*.so* Plugin/GAConnector/64/ + cmake -DDEBUG=$DEBUG -DBIT=64 -DCMAKE_TOOLCHAIN_FILE=../toolchain-lin-64.cmake .. ;; "win32") cmake -DDEBUG=$DEBUG -DBIT=32 -DCMAKE_TOOLCHAIN_FILE=../toolchain-win-32.cmake .. diff --git a/toolchain-lin-32.cmake b/toolchain-lin-32.cmake new file mode 100644 index 0000000..14c7b4d --- /dev/null +++ b/toolchain-lin-32.cmake @@ -0,0 +1,15 @@ +# which compilers to use for C and C++ +set(CMAKE_C_COMPILER clang) +set(CMAKE_CXX_COMPILER clang++) + +# adjust the default behavior of the FIND_XXX() commands: +# search programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + +# search headers and libraries in the target environment +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# 32Bit Libs +SET(CMAKE_LIBRARY_PATH "/usr/lib/i386-linux-gnu") +include_directories(BEFORE /usr/include/i386-linux-gnu) diff --git a/toolchain-lin.cmake b/toolchain-lin-64.cmake similarity index 100% rename from toolchain-lin.cmake rename to toolchain-lin-64.cmake