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

Jump to bottom

pkg-config support #782

Merged
merged 8 commits into from Sep 16, 2016
Merged

pkg-config support #782

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01ac3eb
Remove unnecessary libxml2 link (though it didn't do anything anyway).
rcurtin Sep 12, 2016
504c5e6
Gather all library dependencies in one place.
rcurtin Sep 13, 2016
31eb9b0
Add pkg-config support.
rcurtin Sep 13, 2016
3f13053
Merge branch 'master' into pkgconfig
rcurtin Sep 13, 2016
3aead72
Make sure the version string is properly set.
rcurtin Sep 13, 2016
8376f04
COMPILER_SUPPORT_LIBRARIES is necessary for the command-line programs.
rcurtin Sep 13, 2016
df5e8f5
Don't forget to add the mlpack directories.
rcurtin Sep 13, 2016
96ac227
Fix location of pkg-config file install.
rcurtin Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -506,6 +506,9 @@ if (PKG_CONFIG_FOUND)

set(MLPACK_INCLUDE_DIRS_STRING "${MLPACK_INCLUDE_DIRS_STRING} -I${incldir}")
endforeach ()
# Add the install directory too.
set(MLPACK_INCLUDE_DIRS_STRING
"${MLPACK_INCLUDE_DIRS_STRING} -I${CMAKE_INSTALL_PREFIX}/include/")

# Create the list of link directories.
foreach (linkdir ${MLPACK_LIBRARY_DIRS})
Expand All @@ -520,6 +523,9 @@ if (PKG_CONFIG_FOUND)
set(MLPACK_LIBRARIES_STRING "${MLPACK_LIBRARIES_STRING} -l${lib}")
endif ()
endforeach ()
# Don't forget to add mlpack as a dependency too.
set(MLPACK_LIBRARIES_STRING
"${MLPACK_LIBRARIES_STRING} -L${CMAKE_INSTALL_PREFIX}/lib/ -lmlpack")

# Do first stage of configuration.
set(MLPACK_VERSION_STRING "@MLPACK_VERSION_STRING@")
Expand Down