Skip to content

Commit

Permalink
Ticktock python libs
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jul 12, 2022
1 parent 3712d76 commit 5cc16c0
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 28 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(
REPLACE_GZ_INCLUDE_PATH gz/math
REPLACE_INCLUDE_PATH gz/math
VERSION_SUFFIX pre1)

#============================================================================
Expand Down
2 changes: 2 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ release will remove the deprecated code.
1. Removed the Quaternion integer template `Quaternioni`.

1. The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!

* This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
* Some non-exhaustive examples of this include:
* `GZ_<PROJECT>_<VISIBLE/HIDDEN>`
Expand Down Expand Up @@ -91,6 +92,7 @@ release will remove the deprecated code.
1. `IGN_MASSMATRIX3_DEFAULT_TOLERANCE`
1. All `IGN_*_SIZE_T` variables are deprecated and will be removed in future versions.
Please use `GZ_*_SIZE_T` instead.
1. Python library `ignition` namespaces should be replaced with `gz`.


### Modifications
Expand Down
27 changes: 0 additions & 27 deletions configure.bat

This file was deleted.

20 changes: 20 additions & 0 deletions src/python_pybind11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,26 @@ function(configure_build_install_location _library_name)
install(TARGETS ${_library_name}
DESTINATION "${GZ_PYTHON_INSTALL_PATH}/"
)

# TODO(CH3): Deprecated. Remove on tock.
# Install Python library symlinks
if(${GZ_PYTHON_INSTALL_PATH} MATCHES "gz$")
string(REGEX REPLACE "gz$" "ignition" IGN_PYTHON_INSTALL_PATH ${GZ_PYTHON_INSTALL_PATH})
if (WIN32) # Windows requires copy instead of symlink
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy \
${GZ_PYTHON_INSTALL_PATH}\/${_library_name} \
${PROJECT_BINARY_DIR}\/${_library_name})")
else()
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
${GZ_PYTHON_INSTALL_PATH}\/${_library_name} \
${PROJECT_BINARY_DIR}\/${_library_name})")
endif()

install(FILES ${PROJECT_BINARY_DIR}\/${_library_name}
DESTINATION "${IGN_PYTHON_INSTALL_PATH}/"
)
endif()

endfunction()

configure_build_install_location(math)
Expand Down

0 comments on commit 5cc16c0

Please sign in to comment.