Skip to content

Commit a9e2d8f

Browse files
authored
refactor(cmake): change output dir to user dir (#39)
Signed-off-by: Tony Gorez <[email protected]>
1 parent f76b85a commit a9e2d8f

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ build
33
.DS_Store
44
.vs
55
out
6+
example/*/dist

cmake/example.cmake

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,18 @@ function(add_example)
3636
if(APPLE)
3737
if(EXAMPLE_TYPE STREQUAL "desktop")
3838
add_custom_target(${EXAMPLE_NAME}_run
39-
COMMAND "${EXAMPLE_BINARY_DIR}/${EXAMPLE_APP_NAME}.app/Contents/MacOS/${EXAMPLE_APP_NAME}"
40-
WORKING_DIRECTORY "${EXAMPLE_BINARY_DIR}"
39+
COMMAND "${EXAMPLE_SOURCE_DIR}/dist/${EXAMPLE_APP_NAME}.app/Contents/MacOS/${EXAMPLE_APP_NAME}"
4140
COMMENT "Running ${EXAMPLE_NAME} example (bundle)")
4241
else()
4342
add_custom_target(${EXAMPLE_NAME}_run
44-
COMMAND "${EXAMPLE_BINARY_DIR}/${EXAMPLE_APP_NAME}" --foo bar
45-
WORKING_DIRECTORY "${EXAMPLE_BINARY_DIR}"
43+
COMMAND "${EXAMPLE_SOURCE_DIR}/dist/${EXAMPLE_APP_NAME}" --foo bar
4644
COMMENT "Running ${EXAMPLE_NAME} example (executable)")
4745
endif()
4846
add_dependencies(${EXAMPLE_NAME}_run ${EXAMPLE_NAME}_build)
4947
elseif(WIN32)
5048
add_custom_target(${EXAMPLE_NAME}_run
51-
COMMAND "${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}/$<CONFIG>/${EXAMPLE_APP_NAME}.exe"
52-
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}/$<CONFIG>"
49+
COMMAND "${EXAMPLE_SOURCE_DIR}/dist/$<CONFIG>/${EXAMPLE_APP_NAME}.exe"
50+
WORKING_DIRECTORY "${EXAMPLE_SOURCE_DIR}/dist/$<CONFIG>"
5351
COMMENT "Running ${EXAMPLE_NAME} example (Windows)")
5452
add_dependencies(${EXAMPLE_NAME}_run ${EXAMPLE_NAME}_build)
5553
endif()

cmake/native.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
function(native_add_app)
22
cmake_parse_arguments(NATIVE "" "TARGET;PLATFORM" "ASSETS" ${ARGN})
33

4+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/dist")
5+
46
if(APPLE)
57
_native_add_app_apple(${ARGN})
68
elseif(WIN32)
@@ -281,7 +283,7 @@ function(_native_add_assets_win32)
281283
add_custom_command(
282284
TARGET ${NATIVE_TARGET}
283285
POST_BUILD
284-
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${asset} ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${asset}
286+
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${asset} ${CMAKE_SOURCE_DIR}/dist/$<CONFIG>/${asset}
285287
COMMENT "Copying asset: ${asset} \n"
286288
)
287289
endforeach()

0 commit comments

Comments
 (0)