diff --git a/src/c/config/CMakeLists.txt b/src/c/config/CMakeLists.txt index 455c4089..3d87499c 100644 --- a/src/c/config/CMakeLists.txt +++ b/src/c/config/CMakeLists.txt @@ -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) diff --git a/src/c/config/perfflowaspect.pc.in b/src/c/config/perfflowaspect.pc.in index 7fedbe22..ecf83f61 100644 --- a/src/c/config/perfflowaspect.pc.in +++ b/src/c/config/perfflowaspect.pc.in @@ -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: diff --git a/src/c/parser/CMakeLists.txt b/src/c/parser/CMakeLists.txt index 32d51d8a..0b1a0f57 100644 --- a/src/c/parser/CMakeLists.txt +++ b/src/c/parser/CMakeLists.txt @@ -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 diff --git a/src/c/weaver/weave/CMakeLists.txt b/src/c/weaver/weave/CMakeLists.txt index 2f74a117..6aab8fdd 100644 --- a/src/c/weaver/weave/CMakeLists.txt +++ b/src/c/weaver/weave/CMakeLists.txt @@ -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