Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused AMENT_CMAKE_ENVIRONMENT_GENERATION option #354

Open
wants to merge 3 commits into
base: rolling
Choose a base branch
from
Open

Remove unused AMENT_CMAKE_ENVIRONMENT_GENERATION option #354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a28e4be
Remove unused AMENT_CMAKE_ENVIRONMENT_GENERATION option
sloretz Aug 5, 2021
2edfeed
Add back ament_generate_environment for ros_workspace
sloretz Aug 6, 2021
5428cc0
Remove comment
sloretz Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ament_cmake_core/ament_cmake_environment-extras.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@

# copied from ament_cmake_core/ament_cmake_environment-extras.cmake

option(AMENT_CMAKE_ENVIRONMENT_GENERATION
"Generate environment files in the CMAKE_INSTALL_PREFIX" OFF)
option(AMENT_CMAKE_ENVIRONMENT_PARENT_PREFIX_PATH_GENERATION
"Generate marker file containing the parent prefix path" ON)

include("${ament_cmake_core_DIR}/environment/ament_generate_environment.cmake")

ament_register_extension("ament_package" "ament_cmake_core"
"environment/ament_cmake_environment_package_hook.cmake")
4 changes: 0 additions & 4 deletions ament_cmake_core/cmake/environment/ament_cmake_environment_package_hook.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

if(AMENT_CMAKE_ENVIRONMENT_GENERATION)
ament_generate_environment()
endif()

function(ament_cmake_environment_generate_package_run_dependencies_marker)
# use all run dependencies from the package.xml
set(run_depends "")
Expand Down
50 changes: 0 additions & 50 deletions ament_cmake_core/cmake/environment/ament_generate_environment.cmake
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions ament_cmake_core/cmake/package_templates/templates_2_cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
from ament_package.templates import get_environment_hook_template_path
from ament_package.templates import get_package_level_template_names
from ament_package.templates import get_package_level_template_path
from ament_package.templates import get_prefix_level_template_names
from ament_package.templates import get_prefix_level_template_path

IS_WINDOWS = os.name == 'nt'

Expand Down Expand Up @@ -87,13 +85,6 @@ def generate_cmake_code():
'PACKAGE_LEVEL',
templates))

templates = []
for name in get_prefix_level_template_names():
templates.append('"%s"' % get_prefix_level_template_path(name))
variables.append((
'PREFIX_LEVEL',
templates))

lines = []
for (k, v) in variables:
if isinstance(v, list):
Expand Down