Things compiles (at least on my machine)

CMakeLists.txt

@@ -1012,6 +1012,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 # Coreblas library (kernels for CPUs) #
 #######################################
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/coreblas/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/coreblas/include)
 add_subdirectory(coreblas)
 #------------------------------------------------------------------------------
 
@@ -1021,6 +1023,8 @@ add_subdirectory(coreblas)
 ########################################
 
 if(CHAMELEON_USE_CUDA)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/cudablas/include)
+    include_directories(${CMAKE_CURRENT_BINARY_DIR}/cudablas/include)
     add_subdirectory(cudablas)
 endif()
 #------------------------------------------------------------------------------

compute/zgesvd.c

@@ -23,7 +23,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**

compute/zheevd.c

@@ -23,7 +23,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**

compute/zhetrd.c

@@ -25,7 +25,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**

control/common.h

@@ -77,9 +77,9 @@
  **/
 #include "morse.h"
 
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 #if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
-#include "cudablas/include/cudablas.h"
+#include "cudablas.h"
 #endif
 
 #include "control/global.h"

control/morse_f77.h

@@ -24,7 +24,7 @@
 #ifndef _MORSE_F77_H_
 #define _MORSE_F77_H_
 
-#include "include/morse_mangling.h"
+#include "chameleon/morse_mangling.h"
 
 /** ****************************************************************************
  *  Determine FORTRAN names

example/basic_zposv/basic_posv.h

@@ -47,10 +47,10 @@
 #include <sys/resource.h>
 #endif
 
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas.h>
 
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>

example/lapack_to_morse/step0.c

@@ -23,7 +23,7 @@
  **/
 
 #include "step0.h"
-#include <coreblas/include/coreblas.h>
+#include <coreblas.h>
 
 /*
  * @brief step0 is a simple Cholesky example using the C interface of

example/lapack_to_morse/step0.h

@@ -32,8 +32,8 @@
 #ifndef CBLAS_SADDR
 #define CBLAS_SADDR( _val_ ) &(_val_)
 #endif
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
 
 /* Integer parameters for step0 */
 enum iparam_step0 {

example/lapack_to_morse/step1.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 1 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step1 */

example/lapack_to_morse/step2.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 2 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "morse.h"
 
 /* Integer parameters for step2 */

example/lapack_to_morse/step3.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 3 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step3 */

example/lapack_to_morse/step4.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 4 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step4 */

example/lapack_to_morse/step5.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 5 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step5 */

example/lapack_to_morse/step6.h

@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 6 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>

example/lapack_to_morse/step7.h

@@ -30,8 +30,8 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 7 */
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include <morse.h>
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>

example/link_chameleon/link_chameleon.c

@@ -100,7 +100,7 @@ double cWtime(void)
     gettimeofday( &tp, NULL );
     return tp.tv_sec + 1e-6 * tp.tv_usec;
 }
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step1 */

example/out_of_core/out_of_core.h

@@ -48,7 +48,7 @@
 #endif
 
 #include <starpu.h>
-#include "coreblas/include/lapacke.h"
+#include "coreblas/lapacke.h"
 #include "morse.h"
 #include "control/common.h"
 

lib/pkgconfig/chameleon.pc.in

 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include/chameleon
+includedir=${exec_prefix}/include
 
 Name: chameleon
 Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
 Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_MICRO@
-Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir} -I${includedir}/coreblas/include
+Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir}
 Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
 Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
 Requires: @CHAMELEON_PKGCONFIG_REQUIRED@

lib/pkgconfig/coreblas.pc.in

 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include/chameleon/coreblas/include
+includedir=${exec_prefix}/include
 
 Name: coreblas
 Description: Interface to CBLAS/LAPACKE routines + some other auxiliary routines