Enable adding auxiliary files to projects

STEllAR-GROUP · Sep 10, 2017 · 72b1946 · 72b1946
1 parent 31037f5
commit 72b1946
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake
@@ -8,7 +8,7 @@ macro(add_hpx_component name)
   # retrieve arguments
   set(options EXCLUDE_FROM_ALL AUTOGLOB STATIC PLUGIN)
   set(one_value_args INI FOLDER SOURCE_ROOT HEADER_ROOT SOURCE_GLOB HEADER_GLOB OUTPUT_SUFFIX INSTALL_SUFFIX LANGUAGE)
-  set(multi_value_args SOURCES HEADERS DEPENDENCIES COMPONENT_DEPENDENCIES COMPILE_FLAGS LINK_FLAGS)
+  set(multi_value_args SOURCES HEADERS AUXILIARY DEPENDENCIES COMPONENT_DEPENDENCIES COMPILE_FLAGS LINK_FLAGS)
   cmake_parse_arguments(${name} "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
   if(NOT ${name}_LANGUAGE)
@@ -144,10 +144,10 @@ macro(add_hpx_component name)
 
   if(HPX_WITH_CUDA AND NOT HPX_WITH_CUDA_CLANG)
     cuda_add_library(${name}_component ${${name}_lib_linktype} ${exclude_from_all}
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   else()
     add_library(${name}_component ${${name}_lib_linktype} ${exclude_from_all}
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   endif()
 
   if(${name}_OUTPUT_SUFFIX)

diff --git a/cmake/HPX_AddExecutable.cmake b/cmake/HPX_AddExecutable.cmake
@@ -8,7 +8,7 @@ macro(add_hpx_executable name)
   # retrieve arguments
   set(options EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD AUTOGLOB NOLIBS NOHPX_INIT)
   set(one_value_args INI FOLDER SOURCE_ROOT HEADER_ROOT SOURCE_GLOB HEADER_GLOB OUTPUT_SUFFIX INSTALL_SUFFIX LANGUAGE HPX_PREFIX)
-  set(multi_value_args SOURCES HEADERS DEPENDENCIES COMPONENT_DEPENDENCIES COMPILE_FLAGS LINK_FLAGS)
+  set(multi_value_args SOURCES HEADERS AUXILIARY DEPENDENCIES COMPONENT_DEPENDENCIES COMPILE_FLAGS LINK_FLAGS)
   cmake_parse_arguments(${name} "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
   if(NOT ${name}_LANGUAGE)
@@ -130,10 +130,10 @@ macro(add_hpx_executable name)
 
   if(HPX_WITH_CUDA AND NOT HPX_WITH_CUDA_CLANG)
     cuda_add_executable(${name}_exe
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   else()
     add_executable(${name}_exe
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   endif()
 
   if(${name}_OUTPUT_SUFFIX)

diff --git a/cmake/HPX_AddLibrary.cmake b/cmake/HPX_AddLibrary.cmake
@@ -8,7 +8,7 @@ macro(add_hpx_library name)
   # retrieve arguments
   set(options EXCLUDE_FROM_ALL NOLIBS AUTOGLOB STATIC PLUGIN)
   set(one_value_args FOLDER SOURCE_ROOT HEADER_ROOT SOURCE_GLOB HEADER_GLOB OUTPUT_SUFFIX INSTALL_SUFFIX)
-  set(multi_value_args SOURCES HEADERS DEPENDENCIES COMPONENT_DEPENDENCIES COMPILER_FLAGS LINK_FLAGS)
+  set(multi_value_args SOURCES HEADERS AUXILIARY DEPENDENCIES COMPONENT_DEPENDENCIES COMPILER_FLAGS LINK_FLAGS)
   cmake_parse_arguments(${name} "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
   if(NOT ${name}_SOURCE_ROOT)
@@ -138,10 +138,10 @@ macro(add_hpx_library name)
 
   if(HPX_WITH_CUDA AND NOT HPX_WITH_CUDA_CLANG)
     cuda_add_library(${name}_lib ${${name}_lib_linktype} ${exclude_from_all}
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   else()
     add_library(${name}_lib ${${name}_lib_linktype} ${exclude_from_all}
-      ${${name}_SOURCES} ${${name}_HEADERS})
+      ${${name}_SOURCES} ${${name}_HEADERS} ${${name}_AUXILIARY})
   endif()
 
   if(${name}_OUTPUT_SUFFIX)