Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Chameleon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
Chameleon
Commits
afc24160
Commit
afc24160
authored
8 years ago
by
PRUVOST Florent
Browse files
Options
Downloads
Patches
Plain Diff
fix the generation of the pkgconfig file: missing header path + bad filter on -L/path/to/lib case
parent
f345eb82
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake_modules/GenPkgConfig.cmake
+12
-7
12 additions, 7 deletions
cmake_modules/GenPkgConfig.cmake
lib/pkgconfig/chameleon-quark.pc.in
+1
-1
1 addition, 1 deletion
lib/pkgconfig/chameleon-quark.pc.in
lib/pkgconfig/chameleon-starpu.pc.in
+1
-1
1 addition, 1 deletion
lib/pkgconfig/chameleon-starpu.pc.in
with
14 additions
and
9 deletions
cmake_modules/GenPkgConfig.cmake
+
12
−
7
View file @
afc24160
...
...
@@ -95,13 +95,18 @@ MACRO(GENERATE_PKGCONFIG_FILE _file)
set
(
CHAMELEON_PKGCONFIG_LIBS_CPY
"
${
CHAMELEON_PKGCONFIG_LIBS
}
"
)
set
(
CHAMELEON_PKGCONFIG_LIBS
""
)
foreach
(
_dep
${
CHAMELEON_PKGCONFIG_LIBS_CPY
}
)
get_filename_component
(
dep_we
${
_dep
}
NAME
)
STRING
(
REPLACE
"lib"
"-l"
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".so"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".a"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".dylib"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".dll"
""
dep_we
"
${
dep_we
}
"
)
list
(
APPEND CHAMELEON_PKGCONFIG_LIBS
${
dep_we
}
)
if
(
NOT
${
_dep
}
MATCHES
"^-L"
)
get_filename_component
(
dep_we
${
_dep
}
NAME
)
message
(
STATUS
"dep_we :
${
dep_we
}
"
)
STRING
(
REPLACE
"lib"
"-l"
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".so"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".a"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".dylib"
""
dep_we
"
${
dep_we
}
"
)
STRING
(
REPLACE
".dll"
""
dep_we
"
${
dep_we
}
"
)
list
(
APPEND CHAMELEON_PKGCONFIG_LIBS
${
dep_we
}
)
else
()
list
(
APPEND CHAMELEON_PKGCONFIG_LIBS
${
_dep
}
)
endif
()
endforeach
()
list
(
REMOVE_DUPLICATES CHAMELEON_PKGCONFIG_LIBS
)
...
...
This diff is collapsed.
Click to expand it.
lib/pkgconfig/chameleon-quark.pc.in
+
1
−
1
View file @
afc24160
...
...
@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
Cflags: -I${includedir}
Cflags: -I${includedir}
-I${includedir}/coreblas/include
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
...
...
This diff is collapsed.
Click to expand it.
lib/pkgconfig/chameleon-starpu.pc.in
+
1
−
1
View file @
afc24160
...
...
@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
Cflags: -I${includedir}
Cflags: -I${includedir}
-I${includedir}/coreblas/include
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment