Skip to content

Commit

Permalink
Fixing pkgconfig generation
Browse files Browse the repository at this point in the history
  • Loading branch information
sithhell committed Dec 17, 2012
1 parent fc2bc41 commit 4f0ad70
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Expand Up @@ -1296,6 +1296,7 @@ list(REMOVE_DUPLICATES HPX_INCLUDE_DIRECTORIES)
set(external_rpath "")
set(external_link_directories "")
set(external_libraries "")
set(external_libraries_name "")
set(external_link_flags "")
set(external_include_directories "")
set(external_include_flags "")
Expand All @@ -1310,6 +1311,11 @@ endforeach()
set(external_libraries
${BOOST_FOUND_LIBRARIES})

foreach(lib ${external_libraries})
get_filename_component(lib ${lib} NAME_WE)
set(external_libraries_name "${external_libraries_name} -l${lib}")
endforeach()

foreach(directory ${HPX_INCLUDE_DIRECTORIES})
string(REPLACE " " "\\ " directory ${directory})
set(external_include_directories "${external_include_directories} ${directory}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/templates/hpx_application.pc.in
Expand Up @@ -11,6 +11,6 @@ includedir=${exec_prefix}/include
Name: hpx_application
Description: High Performance ParalleX (application configuration)
Version: @HPX_VERSION@
Libs: -Wl,-rpath,@external_rpath@ @CMAKE_CXX_FLAGS@ @external_link_flags@ -lhpx -lhpx_init
Libs: -Wl,-rpath,@external_rpath@ @CMAKE_CXX_FLAGS@ @external_link_flags@ -lhpx -lhpx_init @external_libraries_name@
Cflags: @CMAKE_CXX_FLAGS@ @external_definitions@ @external_include_flags@ -DHPX_APPLICATION_EXPORTS -DBOOST_ENABLE_ASSERT_HANDLER

2 changes: 1 addition & 1 deletion cmake/templates/hpx_application_debug.pc.in
Expand Up @@ -11,6 +11,6 @@ includedir=${exec_prefix}/include
Name: hpx_application
Description: High Performance ParalleX (application configuration) - debug build
Version: @HPX_VERSION@
Libs: -Wl,-rpath,@external_rpath@ @CMAKE_CXX_FLAGS@ @external_link_flags@ -lhpxd -lhpx_initd
Libs: -Wl,-rpath,@external_rpath@ @CMAKE_CXX_FLAGS@ @external_link_flags@ -lhpxd -lhpx_initd @external_libraries_name@
Cflags: @CMAKE_CXX_FLAGS@ @external_definitions@ @external_include_flags@ -DHPX_APPLICATION_EXPORTS -DBOOST_ENABLE_ASSERT_HANDLER

0 comments on commit 4f0ad70

Please sign in to comment.