1285c1285,1291
<                   SET(_header ${_abs_PATH}/${_basename}.h)
---
> 		  
> 		  IF (EXISTS ${_abs_PATH}/${_basename}.hpp)
> 	                  SET(_header ${_abs_PATH}/${_basename}.hpp)
> 		  ELSE()
> 	                  SET(_header ${_abs_PATH}/${_basename}.h)
> 	          ENDIF()
>