Merge branch 'master' of http://192.168.10.5:8099/sane/code_device
This commit is contained in:
commit
6517f8dbab
|
@ -90,7 +90,7 @@ message(FATAL_ERROR "not find cpu and exit cmake ...")
|
|||
|
||||
endif()
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath=.)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath,$ORIGIN)
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/nick
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
|
||||
|
|
|
@ -23,7 +23,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE hgdriver
|
|||
)
|
||||
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath=.)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath,$ORIGIN)
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
|
||||
${PROJECT_SOURCE_DIR}/../sdk/hginclude
|
||||
${PROJECT_SOURCE_DIR}/../../sdk/include
|
||||
|
|
Loading…
Reference in New Issue