diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 9ea570b43..cc71ed9d2 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT HAVE_GZ_TOOLS)
 endif()
 
 # Make a small static lib of command line functions
-add_library(gz STATIC gz.cc)
+add_library(gz STATIC gz.cc ../FrameSemantics.cc)
 target_link_libraries(gz
   ${PROJECT_LIBRARY_TARGET_NAME}
 )
@@ -47,14 +47,14 @@ endif()
 # Generate the ruby script for internal testing.
 # Note that the major version of the library is included in the name.
 # Ex: cmdsdformat0.rb
-set(cmd_script_generated_test 
+set(cmd_script_generated_test
   "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/gz/cmd${PROJECT_NAME}.rb")
-set(cmd_script_configured_test 
+set(cmd_script_configured_test
   "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${PROJECT_NAME}.rb.configured")
 
 # Set the library_location variable to the full path of the library file within
 # the build directory.
-set(library_location "$<TARGET_FILE:${PROJECT_NAME}>")
+set(library_location "$<TARGET_FILE:${sdf_executable}>")
 
 configure_file(
   "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in"
@@ -82,7 +82,7 @@ else()
   set(library_location_prefix "${CMAKE_INSTALL_LIBDIR}")
 endif()
 
-set(library_location "../../../${library_location_prefix}/$<TARGET_FILE_NAME:${PROJECT_NAME}>")
+set(library_location "../../../${CMAKE_INSTALL_LIBEXECDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/$<TARGET_FILE_NAME:${sdf_executable}>")
 
 configure_file(
   "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in"