test (4a5169a0) · Commits · tuxist / authdb

CMakeLists.txt

+1 −1

Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.18)

		set(CMAKE_CXX_STANDARD 20)
		set(CMAKE_CXX_STANDARD_REQUIRED ON)
		set(WINDOWS_EXPORT_ALL_SYMBOLS ON)

		add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${CMAKE_INSTALL_PREFIX}/share/authdb/data")

		@@ -29,6 +28,7 @@ find_package(json-c REQUIRED)
		find_package(libuuidp REQUIRED)

		include_directories(
		${LIBUUIDP_INCLUDE_DIR}
		BEFORE ${CMAKE_SOURCE_DIR}/src ${UUIDP_INCLUDE_DIR}
		)

cli/CMakeLists.txt

+3 −1

Changes for cli/CMakeLists.txt: 3 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		add_executable(authcli authcli.cpp)

		add_dependencies(authcli client)

		target_include_directories( authcli BEFORE PRIVATE
		"${CMAKE_SOURCE_DIR}/client"
		)

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

		install(TARGETS authcli DESTINATION bin)

client/CMakeLists.txt

+9 −6

Changes for client/CMakeLists.txt: 9 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,23 +4,26 @@ set(WINDOWS_EXPORT_ALL_SYMBOLS ON)

		include_directories(
		${CMAKE_SOURCE_DIR}/src
		${LIBUUIDP_INCLUDE_DIR}
		)

		add_compile_definitions(DATAPATH="${DATAPATH}")

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

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

		target_link_libraries(client PUBLIC $<TARGET_OBJECTS:authobj> uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})
		set_target_properties(clientstatic PROPERTIES OUTPUT_NAME "client-static")

		target_link_libraries(client-static PUBLIC $<TARGET_OBJECTS:authobj> uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})
		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(client-static PROPERTIES
		set_target_properties(clientstatic PROPERTIES
		INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/include/authdb"
		)

		@@ -34,7 +37,7 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
		INSTALL_DESTINATION lib/cmake/authdb
		)

		install(TARGETS client client-static
		install(TARGETS client clientstatic
		EXPORT authdbTargets
		LIBRARY DESTINATION lib
		ARCHIVE DESTINATION lib

client/client.h

+2 −1

Changes for client/client.h: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@

		#include "session.h"
		#include "user.h"
		#include "exception.h"

		#include <httppp/http.h>

		@@ -51,7 +52,7 @@
		#define VISIBILITY __declspec(dllexport)
		#else
		#define VISIBILITY __attribute__((visibility("default")))
		#endif //
		#endif


		namespace authdb {

client/examples/CMakeLists.txt

+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 client-static)
		target_link_libraries(userlogin PRIVATE netplus::netplus httppp::httppp clientstatic)

		add_executable(clientlogin clientlogin.cpp)

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

		add_executable(sessinfo sessinfo.cpp)

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

		add_executable(checkgpo checkgpo.cpp)

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