From f5e703e5ab386952bd0d65b53b3808ef9228be1a Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Wed, 24 Mar 2021 16:42:28 +0100 Subject: [PATCH] cpp-d1064d --- i686-linux-gnu-4.7/setenv.sh | 2 -- i686-linux-gnu-4.7/toolset.cmake | 10 ++-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/i686-linux-gnu-4.7/setenv.sh b/i686-linux-gnu-4.7/setenv.sh index d59e35b..a52e709 100644 --- a/i686-linux-gnu-4.7/setenv.sh +++ b/i686-linux-gnu-4.7/setenv.sh @@ -1,5 +1,3 @@ -#arch_opt="-a i386" BASE=/opt/cross/i686-linux-gnu-4.7 -#CMAKE_MODULE_PATH=$BASE LD_LIBRARY_PATH=$BASE/usr/lib/x86_64-linux-gnu/ diff --git a/i686-linux-gnu-4.7/toolset.cmake b/i686-linux-gnu-4.7/toolset.cmake index a62ef88..4b375e5 100644 --- a/i686-linux-gnu-4.7/toolset.cmake +++ b/i686-linux-gnu-4.7/toolset.cmake @@ -9,15 +9,9 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Search for libraries and headers in the target directories only SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -#add_definitions(-Wall -std=c11) add_definitions(-Wall) -add_compile_options(-std=c++11) -add_compile_options(--sysroot=/opt/cross/i686-linux-gnu-4.7/) -#add_compile_options(-fPIC) -#add_compile_options(-DSHARED) -add_compile_options(-m32) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 --sysroot=/opt/cross/i686-linux-gnu-4.7/" ) -#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -print-search-dirs" ) -set(CMAKE_LIBRARY_PATH /opt/cross/i686-linux-gnu-4.7/usr/lib/x86_64-linux-gnu/32) +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Icross/include -Icross/i686-linux-gnu-4.7/include" ) +link_directories(${CMAKE_HOME_DIRECTORY}/cross/i686-linux-gnu-4.7/lib) -- 2.20.1