Add missing build dependencies

Author: jprotze

openmp/tools/archer/CMakeLists.txt

@@ -15,6 +15,21 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER_SUPPORT)
   target_link_libraries(archer ${CMAKE_DL_LIBS})
   add_library(archer_static STATIC ompt-tsan.cpp)
 
+  if(TARGET cxx-headers)
+    add_dependencies(archer cxx-headers)
+    add_dependencies(archer_static cxx-headers)
+  endif()
+
+  if(TARGET cxx_shared)
+    add_dependencies(archer cxx_shared)
+    add_dependencies(archer_static cxx_shared)
+  endif()
+
+  if(TARGET cxxabi_shared)
+    add_dependencies(archer cxxabi_shared)
+    add_dependencies(archer_static cxxabi_shared)
+  endif()
+
   install(TARGETS archer archer_static
     LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})

openmp/tools/omptest/CMakeLists.txt

@@ -97,6 +97,18 @@ else()
     ./src/OmptTesterStandalone.cpp)
 endif()
 
+if(TARGET cxx-headers)
+  add_dependencies(omptest cxx-headers)
+endif()
+
+if(TARGET cxx_shared)
+  add_dependencies(omptest cxx_shared)
+endif()
+
+if(TARGET cxxabi_shared)
+  add_dependencies(omptest cxxabi_shared)
+endif()
+
 # Add common include directories.
 target_include_directories(omptest PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>