diff --git a/CMakeLists.txt b/CMakeLists.txt
index c29b4c5ab..02ef6212a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,6 +500,14 @@ install(TARGETS ga
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
+if(ENABLE_CXX)
+  install(TARGETS ga++
+      EXPORT globalarrays-targets
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+endif()
+
 #Export the targets to a script
 install(EXPORT globalarrays-targets
     FILE
diff --git a/ga++/CMakeLists.txt b/ga++/CMakeLists.txt
index 28765dcac..b46f6cd31 100644
--- a/ga++/CMakeLists.txt
+++ b/ga++/CMakeLists.txt
@@ -77,12 +77,7 @@ set (_gapp_inc_dirs ${CMAKE_CURRENT_BINARY_DIR}
 
 target_include_directories(ga++ BEFORE PRIVATE ${_gapp_inc_dirs})
 
-target_link_libraries(ga++)
-
-install (TARGETS
-  ga++
-  DESTINATION lib
-)
+target_link_libraries(ga++ PUBLIC ga)
 
 function(gapp_add_parallel_test test_name test_srcs)
   get_filename_component(_test_name_only "${test_name}" NAME)