Skip to content
Snippets Groups Projects
Commit 47743126 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Revert "Install plugin to expected folder"

This reverts commit 7291476e.
parent 89d61c82
No related branches found
No related tags found
No related merge requests found
...@@ -16,4 +16,4 @@ if(MAJOR_VERSION) ...@@ -16,4 +16,4 @@ if(MAJOR_VERSION)
set_target_properties(GalilAxisPlugin PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION}) set_target_properties(GalilAxisPlugin PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION})
endif() endif()
install (TARGETS GalilAxisPlugin LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}) install (TARGETS GalilAxisPlugin LIBRARY DESTINATION ${LIB_INSTALL_DIR})
...@@ -17,4 +17,4 @@ if(MAJOR_VERSION) ...@@ -17,4 +17,4 @@ if(MAJOR_VERSION)
set_target_properties(SimulatedAxisPlugin PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION}) set_target_properties(SimulatedAxisPlugin PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION})
endif() endif()
install (TARGETS SimulatedAxisPlugin LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}) install (TARGETS SimulatedAxisPlugin LIBRARY DESTINATION ${LIB_INSTALL_DIR})
...@@ -38,7 +38,6 @@ class ActuatorSystemRecipe(ConanFile): ...@@ -38,7 +38,6 @@ class ActuatorSystemRecipe(ConanFile):
tc.variables["MAJOR_VERSION"] = major tc.variables["MAJOR_VERSION"] = major
tc.variables["MINOR_VERSION"] = minor tc.variables["MINOR_VERSION"] = minor
tc.variables["PATCH_VERSION"] = patch tc.variables["PATCH_VERSION"] = patch
tc.variables["PLUGIN_INSTALL_DIR"] = "PluginBPT"
tc.generate() tc.generate()
def build(self): def build(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment