Two new ports added. #7071
Two new ports added. #7071
Conversation
|
|
| file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/omnicpp.exe) | ||
|
|
||
|
|
||
| vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OmniORB" TARGET_PATH "lib/cmake/OmniORB") |
There was a problem hiding this comment.
We conventionally place cmake config files in share/<lowercase_name>/; in this case TARGET_PATH "share/omniorb".
|
|
||
| vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OmniORB" TARGET_PATH "lib/cmake/OmniORB") | ||
|
|
||
| file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/OmniORB/*.cmake) |
There was a problem hiding this comment.
These lines can be removed with the above change to TARGET_PATH
| file(COPY ${CURRENT_PACKAGES_DIR}/Lib/site-packages/ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) | ||
|
|
||
|
|
||
| file(READ ${CURRENT_PACKAGES_DIR}/share/OmniORB/OmniORBConfig.cmake _contents) |
There was a problem hiding this comment.
share/OmniORB/ should be lowercased
| @@ -0,0 +1,96 @@ | |||
| # Common Ambient Variables: | |||
There was a problem hiding this comment.
This comment is to help new maintainers, but it shouldn't be kept for the final PR
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA # Disable this option if project cannot be built with Ninja | ||
| OPTIONS -DPython_ROOT_DIR=${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/tools/python3 |
There was a problem hiding this comment.
If python is only needed to run scripts during the build, we can use vcpkg_find_acquire_program(PYTHON3).
| file(COPY ${CURRENT_PACKAGES_DIR}/bin/omniMapper.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) | ||
| file(COPY ${CURRENT_PACKAGES_DIR}/bin/omniidl.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) | ||
| file(COPY ${CURRENT_PACKAGES_DIR}/bin/omnicpp.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) | ||
| file(COPY ${CURRENT_PACKAGES_DIR}/bin/omniORB4.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) |
There was a problem hiding this comment.
Instead of copying a specific list of DLLs, it is better to run vcpkg_copy_tool_dependencies()[1].
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| OPTIONS ${OPTIONS} -DOSGBUILD_OSGWindowQT4=OFF |
There was a problem hiding this comment.
${OPTIONS} probably shouldn't be here.
| @@ -0,0 +1,71 @@ | |||
| # Common Ambient Variables: | |||
|
|
||
| vcpkg_install_cmake() | ||
|
|
||
| vcpkg_fixup_cmake_targets() |
There was a problem hiding this comment.
The cmake files are unfortunately not going to work if we rename the dlls and libs as below. Therefore, this command should probably be removed.
|
Closed for inactivity; please submit a new PR if you'd like to continue! |
OmniORB (4.2.3):
Description: OmniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant.
OpenSG (1.8):
Description: OpenSG is a realtime rendering system based on a scenegraph metaphor.