diff --git a/CMakeLists.txt b/CMakeLists.txt
index c055b07acb248fa5d1a000583dd0b5472e246327..7d47d1d90e1dd454e0286675b473efaf768b051d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1074,13 +1074,14 @@ if(CHAMELEON_ENABLE_DOCS)
 endif()
 #------------------------------------------------------------------------------
 
+get_directory_property( CHAMELEON_DEFINITIONS_LIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
 
 ###############################################################################
 # Config files (pkg_config) #
 #############################
 
-# Create file morse_starpu.pc
-# ---------------------------
+# Create .pc file 
+# ---------------
 generate_pkgconfig_file()
 #------------------------------------------------------------------------------
 
@@ -1106,7 +1107,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")
diff --git a/cmake_modules/GenPkgConfig.cmake b/cmake_modules/GenPkgConfig.cmake
index 44b431e1454cbe86285dce51eed25c7b950b3c0b..f37f1a29c5918413671357b0cbfad57ab25d2c01 100644
--- a/cmake_modules/GenPkgConfig.cmake
+++ b/cmake_modules/GenPkgConfig.cmake
@@ -80,6 +80,26 @@ ENDMACRO(CLEAN_LIB_LIST)
 ###
 MACRO(GENERATE_PKGCONFIG_FILE)
 
+    # The definitions
+    string(REGEX REPLACE ";" " -D" CHAMELEON_PKGCONFIG_DEFINITIONS "${CHAMELEON_DEFINITIONS_LIST}")
+    string(REGEX REPLACE ";" " -D" COREBLAS_PKGCONFIG_DEFINITIONS "${COREBLAS_DEFINITIONS_LIST}")
+    string(REGEX REPLACE ";" " -D" CUDABLAS_PKGCONFIG_DEFINITIONS "${CUDABLAS_DEFINITIONS_LIST}")
+    if (CHAMELEON_PKGCONFIG_DEFINITIONS)
+      set(CHAMELEON_PKGCONFIG_DEFINITIONS "-D${CHAMELEON_PKGCONFIG_DEFINITIONS}")
+    else()
+      set(CHAMELEON_PKGCONFIG_DEFINITIONS "")
+    endif()
+    if (COREBLAS_PKGCONFIG_DEFINITIONS)
+      set(COREBLAS_PKGCONFIG_DEFINITIONS  "-D${COREBLAS_PKGCONFIG_DEFINITIONS}")
+    else()
+      set(COREBLAS_PKGCONFIG_DEFINITIONS "")
+    endif()
+    if (CUDABLAS_PKGCONFIG_DEFINITIONS)
+      set(CUDABLAS_PKGCONFIG_DEFINITIONS  "-D${CUDABLAS_PKGCONFIG_DEFINITIONS}")
+    else()
+      set(CUDABLAS_PKGCONFIG_DEFINITIONS "")
+    endif()
+
     # The link flags specific to this package and any required libraries
     # that don't support PkgConfig
     set(CHAMELEON_PKGCONFIG_LIBS "-lchameleon")
diff --git a/coreblas/CMakeLists.txt b/coreblas/CMakeLists.txt
index df58613de11937a651805d300b49e2b3eceeec78..1769baf432eaaa0e327e67b6ca9c8ef8e2c35c53 100644
--- a/coreblas/CMakeLists.txt
+++ b/coreblas/CMakeLists.txt
@@ -32,6 +32,8 @@ if (NOT CHAMELEON_SIMULATION)
     add_subdirectory(eztrace_module)
 endif()
 
+get_directory_property( COREBLAS_DEFINITIONS_LIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
+
 ###
 ### END CMakeLists.txt
 ###
diff --git a/cudablas/CMakeLists.txt b/cudablas/CMakeLists.txt
index 0a1fb991d088def8d0eb6342779c9f8e20bf18ba..ccfcc7095870be7d748bc234962d65c2e9bdd038 100644
--- a/cudablas/CMakeLists.txt
+++ b/cudablas/CMakeLists.txt
@@ -32,6 +32,8 @@ if (NOT CHAMELEON_SIMULATION)
     add_subdirectory(eztrace_module)
 endif()
 
+get_directory_property( CUDABLAS_DEFINITIONS_LIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
+
 ###
 ### END CMakeLists.txt
 ###
diff --git a/lib/pkgconfig/chameleon.pc.in b/lib/pkgconfig/chameleon.pc.in
index 1a70c174e34e4b02f715cbe85722a5490cb3d475..028e3d907b9dd26401d65f584826615262400a5d 100644
--- a/lib/pkgconfig/chameleon.pc.in
+++ b/lib/pkgconfig/chameleon.pc.in
@@ -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@
diff --git a/lib/pkgconfig/coreblas.pc.in b/lib/pkgconfig/coreblas.pc.in
index 4897a519fe8c692cbe675c8b0934f1343c930ab3..26b1dbb179450f0f04e77d7e15bf441584bab3d6 100644
--- a/lib/pkgconfig/coreblas.pc.in
+++ b/lib/pkgconfig/coreblas.pc.in
@@ -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@
diff --git a/lib/pkgconfig/cudablas.pc.in b/lib/pkgconfig/cudablas.pc.in
index 367cf152075ae3542501bbe58dd85a4d49b75af9..db3f0f14c51c65d3ab245d2cc5371f412646311d 100644
--- a/lib/pkgconfig/cudablas.pc.in
+++ b/lib/pkgconfig/cudablas.pc.in
@@ -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@