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

Tweak pkg-config setup to work with Autotools-based project #59

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

Tweak pkg-config setup to work with Autotools-based project #59

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
20622a7
Creates a non-installed static library version of the parser to link …
ilumsden Jul 12, 2022
ac169eb
Tweaks .pc file and corresponding CMakeLists.txt to work with DYAD's …
ilumsden Jul 12, 2022
a58f7d8
Fixes the libdir for .pc configuration
ilumsden Aug 2, 2022
efc320c
Merge branch 'main' into pkg_config_dyad
ilumsden Dec 2, 2022
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
6 changes: 4 additions & 2 deletions src/c/config/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ install(FILES

# Create pkg-config .pc file
set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${PERFFLOWASPECT_INSTALL_LIB_DIR})
set(PKG_CONFIG_LIBS "-L\${libdir} -lperfflow_runtime -L\${libdir} -lperfflow_parser -L\${libdir} -lWeavePass")

set(PKG_CONFIG_LIBS "-L\${libdir} -lperfflow_runtime -L\${libdir} -lperfflow_parser -lssl -lcrypto")

configure_file(
perfflowaspect.pc.in
${CMAKE_CURRENT_BINARY_DIR}/perfflowaspect.pc)
${CMAKE_CURRENT_BINARY_DIR}/perfflowaspect.pc
@ONLY)

install(FILES ${PROJECT_BINARY_DIR}/config/perfflowaspect.pc
DESTINATION share)
13 changes: 7 additions & 6 deletions src/c/config/perfflowaspect.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Name: ${PROJECT_NAME}
Name: @PROJECT_NAME@
Description: Analyze cross-cutting performance concerns of composite scientific workflows
Version: ${PROJECT_VERSION}
prefix=${CMAKE_INSTALL_PREFIX}
libdir=${PKG_CONFIG_LIBDIR}
Libs: ${PKG_CONFIG_LIBS}
Cflags: -Wc,-Xclang,-load
Version: @PROJECT_VERSION@
prefix=@CMAKE_INSTALL_PREFIX@
libdir=@PKG_CONFIG_LIBDIR@
weavepass=${libdir}/libWeavePass.so
Libs: @PKG_CONFIG_LIBS@
Cflags:
8 changes: 8 additions & 0 deletions src/c/parser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,20 @@ set_source_files_properties(${perfflow_parser_sources} PROPERTIES COMPILE_FLAGS

set_source_files_properties(${FLEX_lexer_OUTPUTS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-register")

add_library(perfflow_parser_static STATIC
${perfflow_parser_sources}
${BISON_parser_OUTPUTS}
${FLEX_lexer_OUTPUTS}
)

add_library(perfflow_parser SHARED
${perfflow_parser_sources}
${BISON_parser_OUTPUTS}
${FLEX_lexer_OUTPUTS}
)

target_include_directories(perfflow_parser_static PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

target_include_directories(perfflow_parser PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

install(TARGETS perfflow_parser
Expand Down
2 changes: 1 addition & 1 deletion src/c/weaver/weave/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set_target_properties(WeavePass PROPERTIES
)

find_library(JANSSON_LIB jansson)
target_link_libraries(WeavePass perfflow_parser "${JANSSON_LIB}")
target_link_libraries(WeavePass perfflow_parser_static "${JANSSON_LIB}")

add_library(WeavePassPlugin INTERFACE)
target_compile_options(WeavePassPlugin INTERFACE
Expand Down