Fixing target dependency names for HPX export

cmake/Modules/APEX_SetupActiveHarmony.cmake

@@ -12,18 +12,18 @@ if(APEX_WITH_ACTIVEHARMONY)
   endif()
 
   # Add an imported target
-  add_library(apex::activeharmony INTERFACE IMPORTED)
+  add_library(activeharmony INTERFACE IMPORTED)
   hpx_info("apex" "Building APEX with Active Harmony support.")
-  set_property(TARGET apex::activeharmony PROPERTY
+  set_property(TARGET activeharmony PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${ACTIVEHARMONY_INCLUDE_DIR})
-  set_property(TARGET apex::activeharmony PROPERTY
+  set_property(TARGET activeharmony PROPERTY
     INTERFACE_LINK_LIBRARIES ${ACTIVEHARMONY_LIBRARIES})
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${ACTIVEHARMONY_LIBRARY_DIR})
 
   # Add the right definitions to the apex_flags target
   target_compile_definitions(apex_flags INTERFACE APEX_HAVE_ACTIVEHARMONY)
 
-  list(APPEND _apex_imported_targets apex::activeharmony)
+  list(APPEND _apex_imported_targets activeharmony)
 
 else()
 

cmake/Modules/APEX_SetupBFD.cmake

@@ -7,14 +7,14 @@ find_package(BFD)
 
 if (BFD_FOUND)
 
-  add_library(apex::bfd INTERFACE IMPORTED)
-  set_property(TARGET apex::bfd PROPERTY
+  add_library(bfd INTERFACE IMPORTED)
+  set_property(TARGET bfd PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${BFD_INCLUDE_DIRS})
-  set_property(TARGET apex::bfd PROPERTY
+  set_property(TARGET bfd PROPERTY
     INTERFACE_LINK_LIBRARIES ${BFD_LIBRARIES})
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${BFD_LIBRARY_DIR})
   message(INFO " Using binutils: ${BFD_LIBRARY_DIR} ${BFD_LIBRARIES}")
 
-  list(APPEND _apex_imported_targets apex::bfd)
+  list(APPEND _apex_imported_targets bfd)
 
 endif()

cmake/Modules/APEX_SetupDemangle.cmake

@@ -8,16 +8,16 @@ find_package(Demangle)
 if (DEMANGLE_FOUND)
 
   # Add an imported target
-  add_library(apex::demangle INTERFACE IMPORTED)
-  set_property(TARGET apex::demangle PROPERTY
+  add_library(demangle INTERFACE IMPORTED)
+  set_property(TARGET demangle PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${DEMANGLE_INCLUDE_DIRS})
-  set_property(TARGET apex::demangle PROPERTY
+  set_property(TARGET demangle PROPERTY
     INTERFACE_LINK_LIBRARIES ${DEMANGLE_LIBRARIES})
 
 	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${DEMANGLE_LIBRARY_DIR})
   message(INFO " Using demangle: ${DEMANGLE_LIBRARY_DIR} ${DEMANGLE_LIBRARIES}")
 
-  list(APPEND _apex_imported_targets apex::demangle)
+  list(APPEND _apex_imported_targets demangle)
 
 else()
 

cmake/Modules/APEX_SetupHPXMP.cmake

@@ -3,13 +3,13 @@
 #  Distributed under the Boost Software License, Version 1.0. (See accompanying
 #  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-add_library(apex::hpxmp INTERFACE IMPORTED)
-set_property(TARGET apex::hpxmp PROPERTY
+add_library(hpxmp INTERFACE IMPORTED)
+set_property(TARGET hpxmp PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${HPXMP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/hpxmp/src)
-set_property(TARGET apex::hpxmp PROPERTY
+set_property(TARGET hpxmp PROPERTY
     INTERFACE_LINK_LIBRARIES ${HPXMP_LIBRARIES})
 set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${HPXMP_LIBRARY_DIR})
 message(INFO " Using binutils: ${HPXMP_LIBRARY_DIR} ${HPXMP_LIBRARIES}")
 
-list(APPEND _apex_imported_targets apex::hpxmp)
+list(APPEND _apex_imported_targets hpxmp)
 

cmake/Modules/APEX_SetupLMSensors.cmake

@@ -18,16 +18,16 @@ if(APEX_WITH_LM_SENSORS)
   endif()
 
   # Add an imported target
-  add_library(apex::lm_sensors INTERFACE IMPORTED)
-  set_property(TARGET apex::lm_sensors PROPERTY
+  add_library(lm_sensors INTERFACE IMPORTED)
+  set_property(TARGET lm_sensors PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${LM_SENSORS_INCLUDE_DIRS})
-  set_property(TARGET apex::lm_sensors PROPERTY
+  set_property(TARGET lm_sensors PROPERTY
     INTERFACE_LINK_LIBRARIES ${LM_SENSORS_LIBRARIES})
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${LM_SENSORS_LIBRARY_DIR})
 
   target_compile_definitions(apex_flags INTERFACE APEX_HAVE_LM_SENSORS)
 
-  list(APPEND _apex_imported_targets apex::lm_sensors)
+  list(APPEND _apex_imported_targets lm_sensors)
 
 endif()
 

cmake/Modules/APEX_SetupMSR.cmake

@@ -13,15 +13,15 @@ if(APEX_WITH_MSR)
   hpx_info("apex" "Building APEX with libmsr support.")
 
   # Add an imported target
-  add_library(apex::msr INTERFACE IMPORTED)
-  set_property(TARGET apex::msr PROPERTY
+  add_library(msr INTERFACE IMPORTED)
+  set_property(TARGET msr PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${MSR_INCLUDE_DIR})
-  set_property(TARGET apex::msr PROPERTY
+  set_property(TARGET msr PROPERTY
     INTERFACE_LINK_LIBRARIES ${MSR_LIBRARIES})
 
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${MSR_LIBRARY_DIR})
   target_compile_definitions(apex_flags INTERFACE APEX_HAVE_MSR)
 
-  list(APPEND _apex_imported_targets apex::msr)
+  list(APPEND _apex_imported_targets msr)
 
 endif()

cmake/Modules/APEX_SetupOTF2.cmake

@@ -11,16 +11,16 @@ if(APEX_WITH_OTF2)
   endif()
 
   # Add an imported target
-  add_library(apex::otf2 INTERFACE IMPORTED)
-  set_property(TARGET apex::otf2 PROPERTY
+  add_library(otf2 INTERFACE IMPORTED)
+  set_property(TARGET otf2 PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${OTF2_INCLUDE_DIRS})
-  set_property(TARGET apex::otf2 PROPERTY
+  set_property(TARGET otf2 PROPERTY
     INTERFACE_LINK_LIBRARIES ${OTF2_LIBRARIES})
 
   set (CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${OTF2_LIBRARY_DIR})
   #target_compile_definitions(apex_flags INTERFACE APEX_USE_CLOCK_TIMESTAMP=1)
 
-  list(APPEND _apex_imported_targets apex::otf2)
+  list(APPEND _apex_imported_targets otf2)
 
 else()
   add_custom_target(project_otf2)

cmake/Modules/APEX_SetupPAPI.cmake

@@ -13,15 +13,15 @@ if(APEX_WITH_PAPI)
   hpx_info("apex" "Building APEX with PAPI support.")
 
   # Add an imported target
-  add_library(apex::papi INTERFACE IMPORTED)
-  set_property(TARGET apex::papi PROPERTY
+  add_library(papi INTERFACE IMPORTED)
+  set_property(TARGET papi PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES ${PAPI_INCLUDE_DIR})
-  set_property(TARGET apex::papi PROPERTY
+  set_property(TARGET papi PROPERTY
     INTERFACE_LINK_LIBRARIES ${PAPI_LIBRARIES})
 
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${PAPI_LIBRARY_DIR})
   target_compile_definitions(apex_flags INTERFACE APEX_HAVE_PAPI)
 
-  list(APPEND _apex_imported_targets apex::papi)
+  list(APPEND _apex_imported_targets papi)
 
 endif()

cmake/Modules/APEX_SetupPlugins.cmake

@@ -19,13 +19,13 @@ if(APEX_WITH_PLUGINS)
     NAMES rapidjson
     PATHS ${APEX_SOURCE_DIR}/rapidjson/include)
 
-  add_library(apex::rapidjson INTERFACE IMPORTED)
+  add_library(rapidjson INTERFACE IMPORTED)
 	if(RAPIDJSON_INCLUDE_DIR)
     message(INFO " Found rapidjson at ${RAPIDJSON_INCLUDE_DIR}")
-    set_property(TARGET apex::rapidjson PROPERTY
+    set_property(TARGET rapidjson PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES ${RAPIDJSON_INCLUDE_DIR})
 
-  list(APPEND _apex_imported_targets apex::rapidjson)
+  list(APPEND _apex_imported_targets rapidjson)
 
 	else()
     message(FATAL_ERROR " rapidjson not found. This should have been checked \

cmake/Modules/APEX_SetupZlib.cmake

@@ -8,12 +8,12 @@ find_package(ZLIB)
 if (ZLIB_FOUND)
 
   # Add an imported target
-  add_library(apex::zlib INTERFACE IMPORTED)
-  set_property(TARGET apex::zlib PROPERTY
+  add_library(zlib INTERFACE IMPORTED)
+  set_property(TARGET zlib PROPERTY
     INTERFACE_LINK_LIBRARIES ${ZLIB_LIBRARIES})
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${ZLIB_LIBRARY_DIR})
   message(INFO " Using zlib: ${ZLIB_LIBRARY_DIR} ${ZLIB_LIBRARIES}")
 
-  list(APPEND _apex_imported_targets apex::zlib)
+  list(APPEND _apex_imported_targets zlib)
 
 endif()

src/apex/CMakeLists.hpx

@@ -371,6 +371,11 @@ configure_file (
   "${APEX_BINARY_DIR}/apex_config.h")
 
 INSTALL(FILES ${apex_headers} DESTINATION include)
+install(TARGETS apex
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
 
 set(AMPLIFIER_ROOT ${AMPLIFIER_ROOT} PARENT_SCOPE)
 set(APEX_FOUND ON PARENT_SCOPE)