File tree 2 files changed +12
-5
lines changed
2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -188,7 +188,7 @@ function(set_helper_process_properties)
188
188
# Store helper processes in the same bundle directory as the main application
189
189
set_target_properties (${targets} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:ladybird>" )
190
190
else ()
191
- set_target_properties (${targets} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${CMAKE_INSTALL_LIBEXECDIR} " )
191
+ set_target_properties (${targets} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${IN_BUILD_PREFIX}${ CMAKE_INSTALL_LIBEXECDIR} " )
192
192
193
193
if (NOT CMAKE_INSTALL_LIBEXECDIR STREQUAL "libexec" )
194
194
set_source_files_properties (Utilities.cpp PROPERTIES COMPILE_DEFINITIONS LADYBIRD_LIBEXECDIR="${CMAKE_INSTALL_LIBEXECDIR} " )
@@ -257,7 +257,7 @@ create_ladybird_bundle(ladybird)
257
257
set_helper_process_properties(${ladybird_helper_processes} )
258
258
259
259
include (cmake/ResourceFiles.cmake)
260
- set (resource_base_dir "${CMAKE_BINARY_DIR} /${CMAKE_INSTALL_DATADIR} /Lagom" )
260
+ set (resource_base_dir "${CMAKE_BINARY_DIR} /${IN_BUILD_PREFIX}${ CMAKE_INSTALL_DATADIR} /Lagom" )
261
261
if (APPLE )
262
262
set (resource_base_dir "$<TARGET_BUNDLE_DIR:ladybird>/Contents/Resources" )
263
263
endif ()
Original file line number Diff line number Diff line change @@ -8,11 +8,18 @@ endif()
8
8
9
9
include (GNUInstallDirs) # make sure to include before we mess w/RPATH
10
10
11
+ # Handle multi-config generators (e.g. MSVC, Xcode, Ninja Multi-Config)
12
+ get_property (is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
13
+ set (IN_BUILD_PREFIX "" )
14
+ if (is_multi_config)
15
+ set (IN_BUILD_PREFIX "$<CONFIG>/" )
16
+ endif ()
17
+
11
18
# Mirror the structure of the installed tree to ensure that rpaths
12
19
# always remain valid.
13
- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${CMAKE_INSTALL_BINDIR} " )
14
- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${CMAKE_INSTALL_LIBDIR} " )
15
- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${CMAKE_INSTALL_LIBDIR} " )
20
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${IN_BUILD_PREFIX}${ CMAKE_INSTALL_BINDIR} " )
21
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${IN_BUILD_PREFIX}${ CMAKE_INSTALL_LIBDIR} " )
22
+ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /${IN_BUILD_PREFIX}${ CMAKE_INSTALL_LIBDIR} " )
16
23
17
24
set (CMAKE_SKIP_BUILD_RPATH FALSE )
18
25
set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
You can’t perform that action at this time.
0 commit comments