Skip to content

Commit

Permalink
Merge pull request #5240 from dnakamura/runtime_dest
Browse files Browse the repository at this point in the history 
CMake: specify RUNTIME DESTINATION when installing shared libraries
  • Loading branch information
@pshipton
pshipton committed Mar 26, 2019
2 parents f53b3a1 + e92ed5b commit 80e1557
Show file tree
Hide file tree
Showing 40 changed files with 73 additions and 33 deletions.
1 change: 1 addition & 0 deletions runtime/compiler/CMakeLists.txt
View file
Expand Up @@ -246,4 +246,5 @@ set_property(TARGET j9jit PROPERTY LINKER_LANGUAGE CXX)
install(
TARGETS j9jit
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/cuda/CMakeLists.txt
View file
@@ -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 @@ -46,4 +46,5 @@ target_link_libraries(cuda4j
install(
TARGETS cuda4j
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
1 change: 1 addition & 0 deletions runtime/gc/CMakeLists.txt
View file
Expand Up @@ -90,4 +90,5 @@ target_include_directories(j9gc
install(
TARGETS j9gc
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/gc_tests/hooktests/CMakeLists.txt
View file
@@ -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 @@ -33,4 +33,5 @@ target_link_libraries(hooktests
install(
TARGETS hooktests
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/gcchk/CMakeLists.txt
View file
@@ -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 @@ -47,4 +47,5 @@ target_link_libraries(j9gcchk
install(
TARGETS j9gcchk
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/harmony/stubs/CMakeLists.txt
View file
@@ -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 @@ -42,4 +42,5 @@ target_link_libraries(hyprtshim
install(
TARGETS hyprtshim
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/harmony/thread/CMakeLists.txt
View file
@@ -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 @@ -37,4 +37,5 @@ target_compile_definitions(hythr
install(
TARGETS hythr
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/hookable/CMakeLists.txt
View file
@@ -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 @@ -36,4 +36,5 @@ target_link_libraries(j9hookable
install(
TARGETS j9hookable
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/hyvm/CMakeLists.txt
View file
@@ -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 @@ -46,4 +46,5 @@ set_target_properties(harmony_jvm PROPERTIES LIBRARY_OUTPUT_NAME "jvm")
install(
TARGETS harmony_jvm
LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
1 change: 1 addition & 0 deletions runtime/j9vm/CMakeLists.txt
View file
Expand Up @@ -83,4 +83,5 @@ add_dependencies(jvm omrgc_hookgen)
install(
TARGETS jvm
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
1 change: 1 addition & 0 deletions runtime/jcl/CMakeLists.txt
View file
Expand Up @@ -225,4 +225,5 @@ endif()
install(
TARGETS jclse
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/jextractnatives/CMakeLists.txt
View file
@@ -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 @@ -42,4 +42,5 @@ target_link_libraries(j9jextract
install(
TARGETS j9jextract
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/jnichk/CMakeLists.txt
View file
@@ -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 @@ -48,4 +48,5 @@ target_link_libraries(j9jnichk
install(
TARGETS j9jnichk
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
1 change: 1 addition & 0 deletions runtime/jsigWrapper/CMakeLists.txt
View file
Expand Up @@ -41,4 +41,5 @@ target_include_directories(jsig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install(
TARGETS jsig
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/jvmti/CMakeLists.txt
View file
@@ -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 @@ -77,4 +77,5 @@ target_link_libraries(j9jvmti
install(
TARGETS j9jvmti
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/mgmt/CMakeLists.txt
View file
@@ -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 @@ -44,4 +44,5 @@ target_link_libraries(management_ext
install(
TARGETS management management_ext
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
1 change: 1 addition & 0 deletions runtime/port/CMakeLists.txt
View file
Expand Up @@ -136,4 +136,5 @@ target_include_directories(j9prt
install(
TARGETS j9prt
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/rasdump/CMakeLists.txt
View file
@@ -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 @@ -64,5 +64,6 @@ target_include_directories(j9dmp
install(
TARGETS j9dmp
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)

3 changes: 2 additions & 1 deletion runtime/rastrace/CMakeLists.txt
View file
@@ -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 @@ -70,5 +70,6 @@ target_link_libraries(j9trc
install(
TARGETS j9trc
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)

1 change: 1 addition & 0 deletions runtime/redirector/CMakeLists.txt
View file
Expand Up @@ -47,4 +47,5 @@ set_target_properties(jvm_redirect PROPERTIES LIBRARY_OUTPUT_NAME jvm)
install(
TARGETS jvm_redirect
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}/redirector
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}/redirector
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/balloon/CMakeLists.txt
View file
@@ -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 @@ -35,4 +35,5 @@ target_link_libraries(balloon
install(
TARGETS balloon
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/javacoregen/CMakeLists.txt
View file
@@ -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 @@ -38,4 +38,5 @@ target_link_libraries(jcoregen
install(
TARGETS jcoregen
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/jlm/CMakeLists.txt
View file
@@ -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 @@ -38,4 +38,5 @@ target_link_libraries(jlmagent
install(
TARGETS jlmagent
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/memorywatcher/CMakeLists.txt
View file
@@ -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 @@ -38,4 +38,5 @@ target_link_libraries(memorywatcher
install(
TARGETS memorywatcher
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/migration/CMakeLists.txt
View file
@@ -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 @@ -41,4 +41,5 @@ target_link_libraries(migration
install(
TARGETS migration
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/osmemory/CMakeLists.txt
View file
@@ -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 @@ -38,4 +38,5 @@ target_link_libraries(osmemory
install(
TARGETS osmemory
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/softmxtest/CMakeLists.txt
View file
@@ -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 @@ -42,4 +42,5 @@ target_link_libraries(softmxtest
install(
TARGETS softmxtest
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/runtimetools/vmruntimestateagent/CMakeLists.txt
View file
@@ -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 @@ -38,4 +38,5 @@ target_link_libraries(vmruntimestateagent
install(
TARGETS vmruntimestateagent
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/shared/CMakeLists.txt
View file
@@ -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 @@ -36,4 +36,5 @@ target_link_libraries(j9shr
install(
TARGETS j9shr
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/tests/bcprof/CMakeLists.txt
View file
@@ -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 @@ -31,4 +31,5 @@ target_link_libraries(bcproftest
install(
TARGETS bcproftest
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/tests/bcverify/CMakeLists.txt
View file
@@ -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 @@ -66,4 +66,5 @@ target_include_directories(bcuwhite
install(
TARGETS bcuwhite
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/tests/j9vm/CMakeLists.txt
View file
@@ -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 @@ -39,4 +39,5 @@ target_include_directories(j9vmtest
install(
TARGETS j9vmtest
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/tests/jni/CMakeLists.txt
View file
@@ -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 @@ -49,4 +49,5 @@ target_include_directories(j9ben
install(
TARGETS j9ben
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)
3 changes: 2 additions & 1 deletion runtime/tests/lazyclassload/CMakeLists.txt
View file
@@ -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 @@ -32,4 +32,5 @@ target_link_libraries(j9lazyClassLoad
install(
TARGETS j9lazyClassLoad
LIBRARY DESTINATION ${j9vm_SOURCE_DIR}
RUNTIME DESTINATION ${j9vm_SOURCE_DIR}
)

0 comments on commit 80e1557

Please sign in to comment.