Skip to content
Snippets Groups Projects
Commit 4d412d8c authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix for cmake build config on linux

parent 6174e720
No related branches found
No related tags found
No related merge requests found
Pipeline #9610 failed
...@@ -73,7 +73,7 @@ check_include_file("uuid/uuid.h" UUID_FOUND) ...@@ -73,7 +73,7 @@ check_include_file("uuid/uuid.h" UUID_FOUND)
if (NOT UUID_FOUND) if (NOT UUID_FOUND)
message(ERROR "UUID library is required") message(ERROR "UUID library is required")
endif() endif()
find_library(UUID_LIBRARIES NAME uuid libuuid) find_library(UUID_LIBRARIES NAMES uuid libuuid)
else() else()
endif() endif()
......
###############################################################################
# Find glog
#
if(WIN32)
find_path(glog_DIR NAMES include/glog/logging.h PATHS "C:/Program Files/glog" "C:/Program Files/google-glog" "C:/Program Files (x86)/google-glog")
set(glog_DIR ${glog_DIR})
else()
set(glog_DIR "")
endif()
# Find lib
set(GLOG_FOUND FALSE CACHE BOOL "" FORCE)
find_library(GLOG_LIBRARY
NAMES glog libglog
PATHS ${glog_DIR}
PATH_SUFFIXES lib/
)
# Find include
find_path(GLOG_INCLUDE_DIRS
NAMES glog/logging.h
PATHS ${glog_DIR}
PATH_SUFFIXES include
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(glog DEFAULT_MSG GLOG_LIBRARY GLOG_INCLUDE_DIRS)
mark_as_advanced(GLOG_FOUND)
if(GLOG_FOUND)
set(GLOG_FOUND TRUE CACHE BOOL "" FORCE)
mark_as_advanced(GLOG_INCLUDE_DIRS GLOG_LIBRARY)
add_library(glog::glog UNKNOWN IMPORTED)
set_property(TARGET glog::glog PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIRS})
set_property(TARGET glog::glog PROPERTY IMPORTED_LOCATION ${GLOG_LIBRARY})
message(STATUS "Found glog: ${GLOG_LIBRARY}")
endif()
...@@ -40,13 +40,13 @@ if (CUDA_FOUND) ...@@ -40,13 +40,13 @@ if (CUDA_FOUND)
endif (CUDA_FOUND) endif (CUDA_FOUND)
add_executable(cv-node ${CVNODESRC}) add_executable(cv-node ${CVNODESRC})
add_dependencies(cv-node net) add_dependencies(cv-node ftlnet)
if (CUDA_FOUND) if (CUDA_FOUND)
set_property(TARGET cv-node PROPERTY CUDA_SEPARABLE_COMPILATION ON) set_property(TARGET cv-node PROPERTY CUDA_SEPARABLE_COMPILATION ON)
endif() endif()
#target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include) #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_link_libraries(cv-node Threads::Threads ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ${PROJECT_BINARY_DIR}/net/cpp/Release/net.lib) target_link_libraries(cv-node Threads::Threads ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ftlnet)
...@@ -19,11 +19,11 @@ set(NETSOURCE ...@@ -19,11 +19,11 @@ set(NETSOURCE
#endif() #endif()
check_function_exists(uriParseSingleUriA HAVE_URIPARSESINGLE) check_function_exists(uriParseSingleUriA HAVE_URIPARSESINGLE)
add_library(net ${NETSOURCE}) add_library(ftlnet ${NETSOURCE})
target_link_libraries(net Threads::Threads glog::glog) target_link_libraries(ftlnet Threads::Threads glog::glog)
add_executable(net-cli src/main.cpp) add_executable(net-cli src/main.cpp)
target_link_libraries(net-cli "${PROJECT_BINARY_DIR}/net/cpp/libnet.a" glog::glog ${URIPARSER_LIBRARIES} Threads::Threads ${READLINE_LIBRARIES} ${UUID_LIBRARIES}) target_link_libraries(net-cli ftlnet glog::glog ${URIPARSER_LIBRARIES} Threads::Threads ${READLINE_LIBRARY} ${UUID_LIBRARIES})
add_dependencies(net-cli net) add_dependencies(net-cli ftlnet)
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment