Merge pull request #1580 from STEllAR-GROUP/fixing_cmake_lists

Prevent some of the internal cmake lists from growing indefinitely
STEllAR-GROUP · Jun 3, 2015 · 6a7c1c7 · 6a7c1c7
2 parents 2b9456c + f746572
commit 6a7c1c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cmake/HPX_LibraryDir.cmake b/cmake/HPX_LibraryDir.cmake
@@ -31,7 +31,8 @@ macro(hpx_library_dir)
       set(_skip FALSE)
     endif()
   endforeach()
-  set(HPX_LIBRARY_DIR ${HPX_LIBRARY_DIR} ${_dirs} CACHE INTERNAL "" FORCE)
+  set(HPX_LIBRARY_DIR ${HPX_LIBRARY_DIR} ${_dirs})
   list(SORT HPX_LIBRARY_DIR)
   list(REMOVE_DUPLICATES HPX_LIBRARY_DIR)
+  set(HPX_LIBRARY_DIR ${HPX_LIBRARY_DIR} CACHE INTERNAL "" FORCE)
 endmacro()
diff --git a/plugins/parcelport/CMakeLists.txt b/plugins/parcelport/CMakeLists.txt
@@ -49,12 +49,22 @@ macro(add_parcelport name)
 
     set(HPX_STATIC_PARCELPORT_PLUGINS_HEADERS
       ${HPX_STATIC_PARCELPORT_PLUGINS_HEADERS}
-      ${${name}_HEADERS}
+      ${${name}_HEADERS})
+    list(SORT HPX_STATIC_PARCELPORT_PLUGINS_HEADERS)
+    list(REMOVE_DUPLICATES HPX_STATIC_PARCELPORT_PLUGINS_HEADERS)
+    set(HPX_STATIC_PARCELPORT_PLUGINS_HEADERS
+      ${HPX_STATIC_PARCELPORT_PLUGINS_HEADERS}
       CACHE INTERNAL "" FORCE)
+
+    set(HPX_STATIC_PARCELPORT_PLUGINS_SOURCES
+      ${HPX_STATIC_PARCELPORT_PLUGINS_SOURCES}
+      ${${name}_SOURCES})
+    list(SORT HPX_STATIC_PARCELPORT_PLUGINS_SOURCES)
+    list(REMOVE_DUPLICATES HPX_STATIC_PARCELPORT_PLUGINS_SOURCES)
     set(HPX_STATIC_PARCELPORT_PLUGINS_SOURCES
       ${HPX_STATIC_PARCELPORT_PLUGINS_SOURCES}
-      ${${name}_SOURCES}
       CACHE INTERNAL "" FORCE)
+
     set(HPX_LIBRARIES ${HPX_LIBRARIES} ${${name}_DEPENDENCIES})
 
   else()