diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 21457aa537564e96262907540c99e656bc886fe0..bcbfb84fa211854503d5b547f120691f1ea96852 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -3,8 +3,8 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2017 Inria. All rights reserved.
-# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
+# @copyright (c) 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+# Univ. Bordeaux. All rights reserved.
#
###
#
@@ -27,7 +27,6 @@
#
###
-
# Generate the morse headers for all possible precisions
# ------------------------------------------------------
set(CHAMELEON_HDRS_GENERATED "")
@@ -49,45 +48,29 @@ configure_file("chameleon/chameleon_config.h.in"
# Define the list of headers
# --------------------------
set(CHAMELEON_HDRS
- chameleon/chameleon_config.h
- chameleon/morse_constants.h
- chameleon/morse_kernels.h
- chameleon/morse_mangling.h
- chameleon/morse_runtime.h
- chameleon/morse_simulate.h
- chameleon/morse_struct.h
- chameleon/morse_tasks.h
- chameleon/morse_types.h
- ${CHAMELEON_HDRS_GENERATED}
- )
+ ${CMAKE_CURRENT_BINARY_DIR}/chameleon/chameleon_config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/chameleon/morse_mangling.h
+ chameleon/morse_constants.h
+ chameleon/morse_kernels.h
+ chameleon/morse_runtime.h
+ chameleon/morse_simulate.h
+ chameleon/morse_struct.h
+ chameleon/morse_tasks.h
+ chameleon/morse_types.h
+ )
-# set(flags_to_add "")
-# foreach(_prec ${CHAMELEON_PRECISION})
-# set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
-# endforeach()
-# set_source_files_properties(runtime.h PROPERTIES COMPILE_FLAGS "${flags_to_add}")
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${CHAMELEON_HDRS_GENERATED} )
+ list(APPEND CHAMELEON_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
# Force generation of headers
# ---------------------------
add_custom_target(chameleon_include
ALL SOURCES morse.h ${CHAMELEON_HDRS} )
-# set(HDR_INSTALL
-# chameleon/chameleon_config.h
-# chameleon/morse_constants.h
-# chameleon/morse_kernels.h
-# chameleon/morse_simulate.h
-# chameleon/morse_struct.h
-# chameleon/morse_types.h
-# chameleon/morse_mangling.h
-# chameleon/runtime.h
-# ${CHAMELEON_HDRS_GENERATED}
-# )
-# foreach( hdr_file ${CHAMELEON_HDRS_GENERATED} )
-# list(APPEND HDR_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
-# endforeach()
-
-# installation
+# Installation
# ------------
install( FILES morse.h
DESTINATION include )