From 2e19aaaff940b77e558dbe735f94e55a03643204 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 27 Sep 2016 20:43:03 -0500 Subject: [PATCH] Remove multi-arch workaround in CMake Since we now require 2.8.11, we can rely on this bug being fixed. --- CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ee3c7cd..499ed1dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,21 +100,6 @@ message(STATUS "Library installation directory: ${CMAKE_INSTALL_LIBDIR}") # Configure library search paths ##################################################################################### -if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "") - # Workaround for Ubuntu/Debian which introduced the "multiarch" library - # directory structure, which is unsupported by CMake < 2.8.10, so we need to - # add paths manually - # see http://www.cmake.org/Bug/view.php?id=12049 and - # http://www.cmake.org/Bug/view.php?id=12037 - list(APPEND ADDITIONAL_LIBRARY_PATHS - /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} - /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} - /lib/${CMAKE_LIBRARY_ARCHITECTURE}) - message(STATUS "additional library directories: ${ADDITIONAL_LIBRARY_PATHS}") -endif() - -##################################################################################### - if (NOT MSVC) option(SIMGEAR_SHARED "Set to ON to build SimGear as a shared library/framework" OFF) option(SYSTEM_EXPAT "Set to ON to build SimGear using the system expat library" OFF)