diff --git a/loader/src/cmd/CMakeLists.txt b/loader/src/cmd/CMakeLists.txt index 2612469d..f443bf10 100644 --- a/loader/src/cmd/CMakeLists.txt +++ b/loader/src/cmd/CMakeLists.txt @@ -12,13 +12,13 @@ target_link_libraries(${plugin_executable} ${loader} ) -set(INSTALL_STANDALONE_EXECUTABLE "${IGN_LIB_INSTALL_DIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(EXE_INSTALL_DIR "${IGN_LIB_INSTALL_DIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") install( TARGETS ${plugin_executable} DESTINATION - ${INSTALL_STANDALONE_EXECUTABLE} + ${EXE_INSTALL_DIR} ) #=============================================================================== @@ -52,7 +52,7 @@ set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/cmd${IGN_DESIGNATION}${PR # Set the library_location variable to the relative path to the library file # within the install directory structure. -set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$") +set(plugin_exe_location "../../../${EXE_INSTALL_DIR}/$") configure_file( "cmd${IGN_DESIGNATION}.rb.in" diff --git a/loader/src/ign_TEST.cc b/loader/src/ign_TEST.cc index 516dbb3b..75c8c925 100644 --- a/loader/src/ign_TEST.cc +++ b/loader/src/ign_TEST.cc @@ -66,6 +66,14 @@ TEST(ignTest, IgnPluginHelp) EXPECT_NE(std::string::npos, output.find("-p,--plugin TEXT Needs: --info")) << output; + + output = custom_exec_str(ign + " plugin"); + EXPECT_NE(std::string::npos, + output.find("-i,--info Get info about a plugin.")) + << output; + EXPECT_NE(std::string::npos, + output.find("-p,--plugin TEXT Needs: --info")) + << output; } //////////////////////////////////////////////////