Skip to content

Commit c8e8204

Browse files
committed
Update cmake ARCHIVE_DIR paths for Open XL
With disabling zos_rename_exports.cmake for Open XL, the side-deck files should be generated in the same directory as the shared libs. As such the "/lib" suffix for the archive directory should not be needed. Additional changes will be required to the extensions repos in order to support these changes. (e.g. updates to expected paths of side-decks for Copy.gmk) Signed-off-by: Gaurav Chaudhari <[email protected]>
1 parent e3451a2 commit c8e8204

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

runtime/CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,19 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "" FORCE)
9191

9292
set(OMR_INSTALL_BIN_DIR "${j9vm_SOURCE_DIR}" CACHE PATH "")
9393
set(OMR_INSTALL_LIB_DIR "${j9vm_SOURCE_DIR}" CACHE PATH "")
94-
set(OMR_INSTALL_ARCHIVE_DIR "${j9vm_SOURCE_DIR}/lib" CACHE PATH "")
94+
if(OMR_OS_ZOS AND (OMR_TOOLCONFIG STREQUAL "openxl"))
95+
set(OMR_INSTALL_ARCHIVE_DIR "${j9vm_SOURCE_DIR}" CACHE PATH "")
96+
else()
97+
set(OMR_INSTALL_ARCHIVE_DIR "${j9vm_SOURCE_DIR}/lib" CACHE PATH "")
98+
endif()
9599

96100
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
97101
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
98-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
102+
if(OMR_OS_ZOS AND (OMR_TOOLCONFIG STREQUAL "openxl"))
103+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
104+
else()
105+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
106+
endif()
99107
# we also want to set the RPATH properly
100108
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
101109

0 commit comments

Comments
 (0)