Skip to content

Commit

Permalink
Workaround doesn't work on Release
Browse files Browse the repository at this point in the history
  • Loading branch information
iguessthislldo committed Apr 11, 2024
1 parent 8b529a3 commit 191f255
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions cmake/build_ace_tao.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ if(OPENDDS_JUST_BUILD_HOST_TOOLS)
list(APPEND _OPENDDS_CONFIGURE_ACE_TAO_ARGS "--workspace-file=${ws}")
endif()

set(_build_cmd "${CMAKE_COMMAND}" -E env "ACE_ROOT=${OPENDDS_ACE}" "TAO_ROOT=${OPENDDS_TAO}")
if(_OPENDDS_XERCES3_FOR_ACE)
list(APPEND _build_cmd "XERCESCROOT=${_OPENDDS_XERCES3_FOR_ACE}")

# Vcpkg debug libraries are in a non-standard place
set(_opendds_debug_vcpkg_xerces3_for_ace "${_OPENDDS_XERCES3_FOR_ACE}/debug/lib")
if(MSVC AND IS_DIRECTORY "${_opendds_debug_vcpkg_xerces3_for_ace}")
list(APPEND _OPENDDS_CONFIGURE_ACE_TAO_ARGS
--env "XERCESC_LIBDIR=${_opendds_debug_vcpkg_xerces3_for_ace}")
endif()
endif()

find_package(Perl REQUIRED)
if(OPENDDS_STATIC)
list(APPEND _OPENDDS_CONFIGURE_ACE_TAO_ARGS --static=1)
Expand All @@ -47,6 +35,11 @@ execute_process(
COMMAND_ERROR_IS_FATAL ANY
)

set(_build_cmd "${CMAKE_COMMAND}" -E env "ACE_ROOT=${OPENDDS_ACE}" "TAO_ROOT=${OPENDDS_TAO}")
if(_OPENDDS_XERCES3_FOR_ACE)
list(APPEND _build_cmd "XERCESCROOT=${_OPENDDS_XERCES3_FOR_ACE}")
endif()

if(_OPENDDS_MPC_TYPE STREQUAL gnuace)
execute_process(
COMMAND
Expand Down

0 comments on commit 191f255

Please sign in to comment.