[Web][CI] fix output path

nokotan · Nov 1, 2022 · 1eb672a · 1eb672a
1 parent b60b8e1
commit 1eb672a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/Web/CI/App/CMakeLists.txt b/Web/CI/App/CMakeLists.txt
@@ -129,7 +129,6 @@ set(SIV3DAPP_EXE_LINKER_FLAGS
   --shell-file=${SIV3D_APP_ROOT}/Templates/Embeddable/web-player.html
   --post-js=${SIV3D_APP_ROOT}/Templates/Embeddable/web-player.js
 )
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 
 
@@ -233,7 +232,8 @@ endif()
 target_link_libraries(Siv3DApp PRIVATE Siv3DAppInterface)
 target_compile_features(Siv3DApp PRIVATE cxx_std_20)
 set_target_properties(Siv3DApp PROPERTIES
-    SUFFIX ".html"
+    SUFFIX .html
+    RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
 target_asyncify_imports(Siv3DApp ${SIV3D_ASYNCIFY_IMPORTS})
@@ -262,7 +262,8 @@ target_compile_features(Siv3DSharedLibApp PRIVATE cxx_std_20)
 target_compile_options(Siv3DSharedLibApp PRIVATE -sMAIN_MODULE=2)
 target_link_options(Siv3DSharedLibApp PRIVATE -sMAIN_MODULE=2)
 set_target_properties(Siv3DSharedLibApp PROPERTIES
-    SUFFIX ".html"
+    SUFFIX .html
+    RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
 target_exported_functions(Siv3DSharedLibApp SIV3D_SHAREDLIB_EXPORTED_FUNCTIONS)
@@ -303,6 +304,7 @@ target_link_options(Siv3DSharedMainApp PRIVATE ${Siv3DLinkerOptions} ${SIV3D_EXE
 set_target_properties(Siv3DSharedMainApp PROPERTIES
     SUFFIX .wasm
     OUTPUT_NAME Siv3DApp
+    RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
 target_asyncify_imports(Siv3DSharedMainApp ${SIV3D_SHAREDMAIN_APP_ASYNCIFY_IMPORTS})
@@ -321,13 +323,7 @@ add_executable(Siv3DSharedMain
 )
 
 if (SIV3D_BUILD_WITH_SHARED_MAIN)
-  set_target_properties(Siv3DSharedMain 
-    PROPERTIES
-      EXCLUDE_FROM_ALL Off
-      OUTPUT_NAME Siv3D
-  )
-
-  set_target_properties(Siv3DSharedMainApp
+  set_target_properties(Siv3DSharedMain Siv3DSharedMainApp
     PROPERTIES
       EXCLUDE_FROM_ALL Off
   )
@@ -363,7 +359,9 @@ target_link_options(Siv3DSharedMain PRIVATE
 )
 set_target_properties(Siv3DSharedMain 
   PROPERTIES
-    SUFFIX ".html"
+    SUFFIX .html
+    OUTPUT_NAME Siv3D
+    RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
 target_asyncify_imports(Siv3DSharedMain ${SIV3D_SHAREDMAIN_ASYNCIFY_IMPORTS})