fix missing build directives

This commit is contained in:
Fabian Posch 2025-01-24 13:06:48 +01:00
parent a66f5b8b7e
commit b121d96b37
2 changed files with 24 additions and 5 deletions

View file

@ -51,11 +51,11 @@ include_directories(./)
# Include shared act libraries # Include shared act libraries
# We need this mostly for file elaboration ahead of cluster deployment # We need this mostly for file elaboration ahead of cluster deployment
#add_library(ActLib SHARED IMPORTED) add_library(act-lib SHARED IMPORTED)
#set_target_properties(ActLib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libact.a) set_target_properties(act-lib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libact.a)
#add_library(ActCommon SHARED IMPORTED) add_library(act-common-lib SHARED IMPORTED)
#set_target_properties(ActCommon PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libvlsilib.a) set_target_properties(act-common-lib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libvlsilib.a)
# Add pqxx # Add pqxx
add_subdirectory(deps/libpqxx build-pqxx EXCLUDE_FROM_ALL) add_subdirectory(deps/libpqxx build-pqxx EXCLUDE_FROM_ALL)
@ -69,11 +69,12 @@ add_subdirectory(deps/libpqxx build-pqxx EXCLUDE_FROM_ALL)
# Set the output directory of executables # Set the output directory of executables
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
set(CMAKE_INSTALL_PREFIX $ENV{ACT_HOME} CACHE PATH "installation path" FORCE) set(CMAKE_INSTALL_PREFIX $ENV{ACT_HOME} CACHE PATH "installation path" FORCE)
add_subdirectory(src) add_subdirectory(src)
# We don't provide a library # We don't provide a library
#install( #install(
# TARGETS dflowchp # TARGETS dflowchp

View file

@ -12,4 +12,22 @@ add_library(
act-cluster-lib act-cluster-lib
STATIC STATIC
${act_cluster_lib_SRC} ${act_cluster_lib_SRC}
)
target_link_libraries(
act-cluster-lib
act-lib
act-common-lib
pqxx
)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/include/cluster
DESTINATION include/cluster
FILES_MATCHING PATTERN "*.h*"
)
install(
TARGETS act-cluster-lib
LIBRARY DESTINATION lib
) )