Commit 067993e0 authored by PRUVOST Florent's avatar PRUVOST Florent

Merge branch 'pkgconfig/add_definitions' into 'master'

add definitions in the pkg-config file

See merge request !50
parents 3b3e6922 84d5ddec
......@@ -1074,13 +1074,12 @@ if(CHAMELEON_ENABLE_DOCS)
endif()
#------------------------------------------------------------------------------
###############################################################################
# Config files (pkg_config) #
#############################
# Create file morse_starpu.pc
# ---------------------------
# Create .pc file
# ---------------
generate_pkgconfig_file()
#------------------------------------------------------------------------------
......@@ -1106,7 +1105,6 @@ include(CPack)
###############################################################################
# Print Options #
#################
get_directory_property( CHAMELEON_DEFINITIONS_LIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
include(PrintOpts)
if (CMAKE_INSTALL_PREFIX STREQUAL "/usr/local" OR CMAKE_INSTALL_PREFIX STREQUAL "C:/Program Files")
......
......@@ -80,6 +80,11 @@ ENDMACRO(CLEAN_LIB_LIST)
###
MACRO(GENERATE_PKGCONFIG_FILE)
# The definitions that should be given to users (change the API)
set(CHAMELEON_PKGCONFIG_DEFINITIONS "")
set(COREBLAS_PKGCONFIG_DEFINITIONS "")
set(CUDABLAS_PKGCONFIG_DEFINITIONS "")
# The link flags specific to this package and any required libraries
# that don't support PkgConfig
set(CHAMELEON_PKGCONFIG_LIBS "-lchameleon")
......
......@@ -68,10 +68,6 @@ foreach (_dep ${CHAMELEON_DEP})
set(dep_message "${dep_message}"
" ${_dep}\n")
endforeach ()
string(REGEX REPLACE ";" " " CHAMELEON_DEFINITIONS_LIST "${CHAMELEON_DEFINITIONS_LIST}")
set(dep_message "${dep_message}"
"\n"
" Definitions: ${CHAMELEON_DEFINITIONS_LIST}\n")
set(dep_message "${dep_message}"
"\n"
" INSTALL_PREFIX ......: ${CMAKE_INSTALL_PREFIX}\n\n")
......
......@@ -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_MICRO@
Cflags: -I${includedir} -I${includedir}/coreblas/include
Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir} -I${includedir}/coreblas/include
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
......
......@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon/coreblas/include
Name: coreblas
Description: Interface to CBLAS/LAPACKE routines + some other auxiliary routines
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_MICRO@
Cflags: -I${includedir}
Cflags: @COREBLAS_PKGCONFIG_DEFINITIONS@ -I${includedir}
Libs: -L${libdir} @COREBLAS_PKGCONFIG_LIBS@
Libs.private: @COREBLAS_PKGCONFIG_LIBS_PRIVATE@
Requires: @COREBLAS_PKGCONFIG_REQUIRED@
......
......@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon/cudablas/include
Name: cudablas
Description: Interface to cuBLAS/MAGMA routines + some other auxiliary routines
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_MICRO@
Cflags: -I${includedir}
Cflags: @CUDABLAS_PKGCONFIG_DEFINITIONS@ -I${includedir}
Libs: -L${libdir} @CUDABLAS_PKGCONFIG_LIBS@
Libs.private: @CUDABLAS_PKGCONFIG_LIBS_PRIVATE@
Requires: @CUDABLAS_PKGCONFIG_REQUIRED@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment