diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1658f6080817c4054de83b8999293e87383c658..2e3abf1dc6d322a64241b95b973209cee34e9a2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ else()
set( BUILD_SUBPROJECT ON )
endif()
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
include(GenHQRPkgConfig)
# The current version number
@@ -66,7 +66,7 @@ install(FILES
install(TARGETS hqr DESTINATION lib)
-generate_hqr_pkgconfig_file()
+#generate_hqr_pkgconfig_file()
#-- Add a custom target to generate tags
add_custom_target (tags
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3a7f943df664ce6aa46ab5052fcfd89e73a56649..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-CC = gcc
-CFLAGS = -Iinclude -Wall -g3
-LDFLAGS = -lm
-LIBHQR=src/libhqr.a
-
-default: testing_pivgen testing_treedraw testing_tileinit
-
-src/queue.o: include/queue.h include/common.h
-src/libhqr.o: include/common.h include/libhqr.h
-src/libhqr_dbg.o: include/common.h include/libhqr.h
-src/libhqr_systolic.o: include/common.h include/libhqr.h
-src/treewalk.o: include/common.h include/libhqr.h include/queue.h
-src/treedraw.o: include/common.h include/libhqr.h include/libdraw.h
-
-$(LIBHQR): src/libhqr.o src/libhqr_dbg.o src/libhqr_systolic.o src/treewalk.o src/queue.o src/treedraw.o
- ar cr $@ $^
-
-%.o : %.c
- $(CC) -c $< -o $@ $(CFLAGS)
-
-testing_pivgen : testings/testing_pivgen.o ${LIBHQR}
- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
-
-testing_treedraw : testings/testing_treedraw.o ${LIBHQR}
- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
-
-testing_tileinit : testings/testing_tileinit.o ${LIBHQR}
- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
-
-clean :
- rm -f include/*~
- rm -f src/*.o src/*~
- rm -f testings/*.o testings/*~
-
-cleanall: clean
- rm -f ${LIBHQR}
- rm -f testing_pivgen testing_treedraw testing_tileinit tree.svg
diff --git a/cmake_modules/GenHQRPkgConfig.cmake b/cmake_modules/GenHQRPkgConfig.cmake
index 6335666ef7e5a2b4039f5767a10e76600456db0f..b20623ea042623b74bcd616ed9327b28a74f491d 100644
--- a/cmake_modules/GenHQRPkgConfig.cmake
+++ b/cmake_modules/GenHQRPkgConfig.cmake
@@ -33,18 +33,18 @@
# used in CLEAN_LIB_LIST
#
###
-MACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
+macro(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
set(${_liblist}_CPY "${${_liblist}}")
set(${_liblist} "")
foreach(_dep ${${_liblist}_CPY})
if (${_dep} MATCHES "^/")
get_filename_component(dep_libname ${_dep} NAME)
get_filename_component(dep_libdir ${_dep} DIRECTORY)
- STRING(REPLACE "lib" "" dep_libname "${dep_libname}")
- STRING(REPLACE ".so" "" dep_libname "${dep_libname}")
- STRING(REPLACE ".a" "" dep_libname "${dep_libname}")
- STRING(REPLACE ".dylib" "" dep_libname "${dep_libname}")
- STRING(REPLACE ".dll" "" dep_libname "${dep_libname}")
+ string(REPLACE "lib" "" dep_libname "${dep_libname}")
+ string(REPLACE ".so" "" dep_libname "${dep_libname}")
+ string(REPLACE ".a" "" dep_libname "${dep_libname}")
+ string(REPLACE ".dylib" "" dep_libname "${dep_libname}")
+ string(REPLACE ".dll" "" dep_libname "${dep_libname}")
list(APPEND ${_liblist} -L${dep_libdir} -l${dep_libname})
elseif(NOT ${_dep} MATCHES "^-")
list(APPEND ${_liblist} "-l${_dep}")
@@ -52,7 +52,7 @@ MACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
list(APPEND ${_liblist} ${_dep})
endif()
endforeach()
-ENDMACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG)
+endmacro(CONVERT_LIBSTYLE_TO_PKGCONFIG)
###
#
@@ -60,44 +60,44 @@ ENDMACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG)
# used in GENERATE_PKGCONFIG_FILE
#
###
-MACRO(CLEAN_LIB_LIST _package)
+macro(CLEAN_LIB_LIST _package)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_LIBS)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_LIBS_PRIVATE)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_REQUIRED)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_REQUIRED_PRIVATE)
- CONVERT_LIBSTYLE_TO_PKGCONFIG(${_package}_PKGCONFIG_LIBS)
- CONVERT_LIBSTYLE_TO_PKGCONFIG(${_package}_PKGCONFIG_LIBS_PRIVATE)
- STRING(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS "${${_package}_PKGCONFIG_LIBS}")
- STRING(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS_PRIVATE "${${_package}_PKGCONFIG_LIBS_PRIVATE}")
- STRING(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED "${${_package}_PKGCONFIG_REQUIRED}")
- STRING(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED_PRIVATE "${${_package}_PKGCONFIG_REQUIRED_PRIVATE}")
-ENDMACRO(CLEAN_LIB_LIST)
+ convert_libstyle_to_pkgconfig(${_package}_PKGCONFIG_LIBS)
+ convert_libstyle_to_pkgconfig(${_package}_PKGCONFIG_LIBS_PRIVATE)
+ string(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS "${${_package}_PKGCONFIG_LIBS}")
+ string(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS_PRIVATE "${${_package}_PKGCONFIG_LIBS_PRIVATE}")
+ string(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED "${${_package}_PKGCONFIG_REQUIRED}")
+ string(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED_PRIVATE "${${_package}_PKGCONFIG_REQUIRED_PRIVATE}")
+endmacro(CLEAN_LIB_LIST)
###
#
# GENERATE_PKGCONFIG_FILE: generate files libhqr.pc
#
###
-MACRO(GENERATE_HQR_PKGCONFIG_FILE)
+macro(GENERATE_HQR_PKGCONFIG_FILE)
- SET(HQR_PKGCONFIG_LIBS "-lhqr")
- SET(HQR_PKGCONFIG_LIBS_PRIVATE "-lm")
- SET(HQR_PKGCONFIG_REQUIRED "")
- SET(HQR_PKGCONFIG_REQUIRED_PRIVATE "")
+ set(HQR_PKGCONFIG_LIBS "-lhqr")
+ set(HQR_PKGCONFIG_LIBS_PRIVATE "-lm")
+ set(HQR_PKGCONFIG_REQUIRED "")
+ set(HQR_PKGCONFIG_REQUIRED_PRIVATE "")
- CLEAN_LIB_LIST(LIBHQR)
+ clean_lib_list(LIBHQR)
- SET(_output_libhqr_file "${CMAKE_BINARY_DIR}/hqr.pc")
- CONFIGURE_FILE(
+ set(_output_libhqr_file "${CMAKE_BINARY_DIR}/hqr.pc")
+ configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lib/pkgconfig/hqr.pc.in"
"${_output_hqr_file}"
@ONLY
)
- INSTALL(
+ install(
FILES ${_output_hqr_file}
DESTINATION lib/pkgconfig
)
-ENDMACRO(GENERATE_PKGCONFIG_FILE)
+endmacro(GENERATE_HQR_PKGCONFIG_FILE)
##
## @end file GenPkgConfig.cmake
diff --git a/src/treewalk.c b/src/treewalk.c
index 9f741a8f7edbcd6d378ec58cf79e4b85da60f20f..81a74e732c16bb0e3f070d26fa5a6350dc4a7bb8 100644
--- a/src/treewalk.c
+++ b/src/treewalk.c
@@ -162,7 +162,7 @@ void libhqr_treewalk(const libhqr_tree_t *qrtree, int k, int *tiles)
***************************************************/
void libhqr_print_tree(const libhqr_tree_t *qrtree, libhqr_tiledesc_t *matrix){
- int maxMN, minMN, k, i, step_m;
+ int maxMN, minMN, k, i;
int *tiles;
int *step;
FILE *file;
diff --git a/testings/testing_tileinit.c b/testings/testing_tileinit.c
index 3da0d5105c9dc91ad18cffd2091c282c30a9c8a3..f75f8900c996ce9148aabc5fbd3a7924f52fa8cd 100644
--- a/testings/testing_tileinit.c
+++ b/testings/testing_tileinit.c
@@ -22,7 +22,6 @@
int
main(int argc, char ** argv)
{
- int rc;
libhqr_tree_t qrtree;
libhqr_tiledesc_t matrix;
@@ -32,7 +31,7 @@ main(int argc, char ** argv)
matrix.mt = 1;
matrix.nt = 1;
libhqr_hqr_init( &qrtree, LIBHQR_QR, &matrix, 0, 0, 1, 3, 0, 0);
- rc = libhqr_tree_check( &matrix, &qrtree );
+ if(libhqr_tree_check( &matrix, &qrtree )) return 0;
libhqr_matrix_finalize( &qrtree );
return 1;
}