Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wato #161

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Wato #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
969fd6f
Add -lcrypto library to link against
watologo1 Feb 24, 2023
d394c5b
Add pthread to be linked against
watologo1 Feb 24, 2023
f346c79
Make use of standard variables for installation
watologo1 Feb 24, 2023
9ac1e41
Add configure_file and pkg-config template
watologo1 Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)

if(NOT DEFINED INCLUDE_INSTALL_DIR)
set(INCLUDE_INSTALL_DIR include)
endif()
if(NOT DEFINED CMAKE_INSTALL_BINDIR)
set(CMAKE_INSTALL_BINDIR bin)
endif()
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR lib)
endif()

set(CMAKE_C_FLAGS_DEBUG "-D_DEBUG")

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
Expand Down Expand Up @@ -41,6 +51,7 @@ find_package(Jansson REQUIRED)
find_package(CZMQ)
find_package(OpenSSL)
find_package(Readline)
find_package(Threads)

include_directories(${CURL_INCLUDE_DIR})
include_directories(${JANSSON_INCLUDE_DIRS})
Expand All @@ -67,8 +78,12 @@ endif()
if(OPENSSL_FOUND)
add_definitions(-DHAVE_OPENSSL)
target_link_libraries(redfish ${OPENSSL_SSL_LIBRARY})
target_link_libraries(redfish ${OPENSSL_CRYPTO_LIBRARY})
endif()

set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG ON)
target_link_libraries(redfish Threads::Threads)

add_executable(redfishtest "${CMAKE_CURRENT_SOURCE_DIR}/examples/test.c")
target_link_libraries(redfishtest redfish)
Expand All @@ -92,10 +107,10 @@ if(CZMQ_FOUND)
endif()

install(TARGETS redfishtest redfish
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)
install(FILES ${REDFISH_HDR_PUBLIC_RED} DESTINATION include)
install(FILES ${REDFISH_HDR_PUBLIC_ENTITIES} DESTINATION include/entities)
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES ${REDFISH_HDR_PUBLIC_RED} DESTINATION "${INCLUDE_INSTALL_DIR}")
install(FILES ${REDFISH_HDR_PUBLIC_ENTITIES} DESTINATION "${INCLUDE_INSTALL_DIR}/entities")

ENABLE_TESTING()

Expand Down Expand Up @@ -123,3 +138,5 @@ elseif(MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LIBPATH:.. /LIBPATH:../curl/lib")
endif()
endif()

configure_file(libredfish.pc.in libredfish.pc @ONLY)
19 changes: 19 additions & 0 deletions libredfish.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# this template is filled-in by CMake `configure_file(... @ONLY)`
# the `@....@` are filled in by CMake configure_file(),
# from variables set in your CMakeLists.txt or by CMake itself
#
# Good tutoral for understanding .pc files:
# https://people.freedesktop.org/~dbn/pkg-config-guide.html

prefix="@CMAKE_INSTALL_PREFIX@"
exec_prefix="@CMAKE_INSTALL_BINDIR@
libdir="@CMAKE_INSTALL_LIBDIR@"
includedir="@INCLUDE_INSTALL_DIR@"

Name: @PROJECT_NAME@
Description: Redfish library
URL: https://github.com/DMTF/libredfish
Version: @LIBREDFISH_VERSION_STRING@
Requires: @pc_req_public@
Cflags: -I"${includedir}"
Libs: -L"${libdir}" -lredfish