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

some fixes

parent 925ee267
Loading
Loading
Loading
Loading
Loading
+10 −4
Changes for client/CMakeLists.txt: 10 added lines, 4 removed lines.
Original line number Diff line number Diff line
include(CMakePackageConfigHelpers)

add_library(client SHARED client.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp)
include_directories(
    ${CMAKE_SOURCE_DIR}/src
)

add_compile_definitions(DATAPATH="${DATAPATH}")

add_library(client SHARED client.cpp ../src/authdb.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp ../src/backend.cpp  ../src/backends/file.cpp ../src/group.cpp )

add_library(client-static STATIC client.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp)
add_library(client-static STATIC client.cpp ../src/authdb.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp ../src/backend.cpp ../src/backends/file.cpp ../src/group.cpp )

target_link_libraries(client PUBLIC netplus::netplus json-c::json-c httppp::httppp uuid)

target_link_libraries(client-static PUBLIC netplus::netplus json-c::json-c httppp::httppp uuid)

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

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

write_basic_package_version_file(
+2 −3
Changes for client/client.h: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -26,12 +26,11 @@
 *******************************************************************************/

#include <string>
#include <uuid.h>
#include <session.h>

#include <httppp/http.h>

#include "../src/uuid.h"
#include "../src/session.h"

#pragma once

namespace authdb {
+2 −0
Changes for client/examples/clientlogin.cpp: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/

#include <iostream>

#include "../client.h"

int main(int argc, char *argv[]){
+2 −0
Changes for client/examples/userlogin.cpp: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/

#include <iostream>

#include "../client.h"

int main(int argc, char *argv[]){
+2 −0
Changes for src/CMakeLists.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,5 +28,7 @@ add_executable(

target_link_libraries(authdb PUBLIC fback json-c::json-c httppp::httppp netplus::netplus confplus::confplus cmdplus::cmdplus htmlpp::htmlpp uuid)

install(FILES uuid.h session.h authdb.h backend.h types.h group.h DESTINATION include/authdb)

install(TARGETS fback DESTINATION lib)
install(TARGETS authdb DESTINATION bin)
Loading