From 43e94e377f0db4031652f0e1f6f0a8e067c04d76 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 25 Jul 2018 16:51:24 +0100 Subject: [PATCH] Update CMake to set BIN_LIBROOT and BIN_RPATH to the new x86 and x64 folders --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 908b2c1..d81dede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,19 +20,19 @@ if (APPLE) SET(KICKLIBS iconv) include_directories(${INCULDE_DIRECTORIES} /Library/Frameworks/Mono.framework/Headers/mono-2.0) elseif (CMAKE_SIZEOF_VOID_P MATCHES "8" AND NOT(FORCE32)) - SET(BIN_LIBROOT "lib64") + SET(BIN_LIBROOT "x64") SET(CMAKE_EXECUTABLE_SUFFIX ".bin.x86_64") - SET(BIN_RPATH "\$ORIGIN/lib64") + SET(BIN_RPATH "\$ORIGIN/x64") SET(KICKLIBS m rt dl) include_directories(${INCULDE_DIRECTORIES} /usr/include/mono-2.0) else() - SET(BIN_LIBROOT "lib") + SET(BIN_LIBROOT "x86") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") SET(CMAKE_EXECUTABLE_SUFFIX ".bin.arm") else() SET(CMAKE_EXECUTABLE_SUFFIX ".bin.x86") endif() - SET(BIN_RPATH "\$ORIGIN/lib") + SET(BIN_RPATH "\$ORIGIN/x86") SET(KICKLIBS m rt dl) include_directories(${INCULDE_DIRECTORIES} /usr/include/mono-2.0) endif()