Commit ccec76b9 authored by jan.koester's avatar jan.koester
Browse files

test

parent 435f98a7
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for cli/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ target_include_directories( authcli BEFORE PRIVATE
   "${CMAKE_SOURCE_DIR}/client"
)

target_link_libraries(authcli PUBLIC cmdplus::cmdplus PRIVATE clientstatic)
target_link_libraries(authcli PUBLIC cmdplus::cmdplus PRIVATE client)

install(TARGETS authcli DESTINATION bin)
+2 −13
Changes for client/CMakeLists.txt: 2 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -9,25 +9,14 @@ include_directories(

add_compile_definitions(DATAPATH="${DATAPATH}")

add_library(client SHARED client.cpp  $<TARGET_OBJECTS:authobj>)

add_library(clientstatic STATIC client.cpp $<TARGET_OBJECTS:authobj>)

set_target_properties(client PROPERTIES INTERFACE_LINK_LIBRARIES clientstatic)

add_library(client STATIC client.cpp  $<TARGET_OBJECTS:authobj>)

target_link_libraries(client PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp  ${LIBUUID_LIBRARY})

target_link_libraries(clientstatic PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp ${LIBUUID_LIBRARY})

set_target_properties(client PROPERTIES
  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/include/authdb"
)

set_target_properties(clientstatic PROPERTIES
  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/include/authdb"
)

write_basic_package_version_file(
  "${CMAKE_CURRENT_BINARY_DIR}/authdbConfigVersion.cmake"
  VERSION "${version}"
@@ -38,7 +27,7 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
  INSTALL_DESTINATION lib/cmake/authdb
)

install(TARGETS client clientstatic
install(TARGETS client 
        EXPORT authdbTargets
        LIBRARY DESTINATION lib
        ARCHIVE DESTINATION lib
+4 −4
Changes for client/examples/CMakeLists.txt: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
add_executable(userlogin userlogin.cpp)

target_link_libraries(userlogin PRIVATE netplus::netplus httppp::httppp clientstatic)
target_link_libraries(userlogin PRIVATE netplus::netplus httppp::httppp client)

add_executable(clientlogin clientlogin.cpp)

target_link_libraries(clientlogin PRIVATE netplus::netplus httppp::httppp clientstatic)
target_link_libraries(clientlogin PRIVATE netplus::netplus httppp::httppp client)

add_executable(sessinfo sessinfo.cpp)

target_link_libraries(sessinfo PRIVATE netplus::netplus httppp::httppp  clientstatic)
target_link_libraries(sessinfo PRIVATE netplus::netplus httppp::httppp  client)

add_executable(checkgpo checkgpo.cpp)

target_link_libraries(checkgpo PRIVATE netplus::netplus httppp::httppp clientstatic)
target_link_libraries(checkgpo PRIVATE netplus::netplus httppp::httppp client)