Skip to content

Commit

Permalink
Merge pull request #5270 from dnakamura/cmake_util
Browse files Browse the repository at this point in the history
CMake: add windows support to j9util
  • Loading branch information
pshipton committed Mar 27, 2019
2 parents 16ca602 + c645f59 commit b9fd268
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions runtime/util/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
################################################################################
# Copyright (c) 2017, 2018 IBM Corp. and others
# Copyright (c) 2017, 2019 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -104,11 +104,14 @@ add_library(j9util STATIC
${CMAKE_CURRENT_BINARY_DIR}/ut_j9vmutil.c
${CMAKE_CURRENT_BINARY_DIR}/ut_module.c
${CMAKE_CURRENT_BINARY_DIR}/ut_srphashtable.c

# TODO this is platform specific
linux/osinfo.c
)

if(OMR_OS_LINUX)
target_sources(j9util PRIVATE linux/osinfo.c)
elseif(OMR_OS_WINDOWS)
target_sources(j9util PRIVATE win32/openlibrary.c)
endif()

if(OMR_ARCH_X86)
target_sources(j9util
PRIVATE
Expand Down

0 comments on commit b9fd268

Please sign in to comment.