Added /usr/lib to -rpath (in CMake)
This commit is contained in:
parent
e0059c8520
commit
2f19ddc459
3 changed files with 3 additions and 3 deletions
|
|
@ -121,7 +121,7 @@ target_compile_definitions(${TOOLS_TARGET} PUBLIC BUILD_NR=${BUILD_NUMBER} MAJ_
|
||||||
#TODO: Different flags for Release/Debug
|
#TODO: Different flags for Release/Debug
|
||||||
add_compile_options(-O3 -m32 -MMD -MP -Wall -ggdb)
|
add_compile_options(-O3 -m32 -MMD -MP -Wall -ggdb)
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN',-rpath,/usr/lib" )
|
||||||
target_link_libraries(${RUNTIME_TARGET} xcb xcb-randr boost_regex)
|
target_link_libraries(${RUNTIME_TARGET} xcb xcb-randr boost_regex)
|
||||||
target_link_libraries(${ASSEMBLER_TARGET} xcb xcb-randr boost_regex)
|
target_link_libraries(${ASSEMBLER_TARGET} xcb xcb-randr boost_regex)
|
||||||
target_link_libraries(${TOOLS_TARGET} xcb xcb-randr boost_regex)
|
target_link_libraries(${TOOLS_TARGET} xcb xcb-randr boost_regex)
|
||||||
|
|
|
||||||
2
build.nr
2
build.nr
|
|
@ -1 +1 @@
|
||||||
1610
|
1613
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
## --
|
## --
|
||||||
## -- This file is automatically generated by the DragonAssembler (version 0.4.1608)
|
## -- This file is automatically generated by the DragonAssembler (version 0.4.1612)
|
||||||
## -- Please do not modify this file in any way.
|
## -- Please do not modify this file in any way.
|
||||||
## --
|
## --
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue