From 8a5f1b501777110ef9ecc3f7ba66193715657ccb Mon Sep 17 00:00:00 2001
From: "[ ]" <[ ]>
Date: Fri, 9 May 2025 02:56:04 +0900
Subject: [PATCH] build: Fix merge inconsistencies

> revert no longer needed fixes
> update clion configs
---
 .idea/runConfigurations/Deploy_Debug_x64_.xml  |  2 +-
 .idea/runConfigurations/Deploy_Debug_x86_.xml  |  2 +-
 .idea/runConfigurations/Deploy_Extra_x64_.xml  |  2 +-
 .idea/runConfigurations/Deploy_Extra_x86_.xml  |  2 +-
 .../runConfigurations/Deploy_Release_x64_.xml  |  2 +-
 .../runConfigurations/Deploy_Release_x86_.xml  |  2 +-
 .../runConfigurations/Distribute_Release_.xml  |  2 +-
 .../runConfigurations/spicetools_spice_laa.xml |  9 +++++++++
 .../spicetools_stubs_nvEncodeAPI64.xml         |  7 +++++++
 .../spicetools_stubs_nvcuda.xml                |  7 +++++++
 .../spicetools_stubs_nvcuvid.xml               |  7 +++++++
 CMakeLists.txt                                 | 18 ------------------
 12 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 .idea/runConfigurations/spicetools_spice_laa.xml
 create mode 100644 .idea/runConfigurations/spicetools_stubs_nvEncodeAPI64.xml
 create mode 100644 .idea/runConfigurations/spicetools_stubs_nvcuda.xml
 create mode 100644 .idea/runConfigurations/spicetools_stubs_nvcuvid.xml

diff --git a/.idea/runConfigurations/Deploy_Debug_x64_.xml b/.idea/runConfigurations/Deploy_Debug_x64_.xml
index d477afb..db1e8c5 100644
--- a/.idea/runConfigurations/Deploy_Debug_x64_.xml
+++ b/.idea/runConfigurations/Deploy_Debug_x64_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Deploy_Debug_x86_.xml b/.idea/runConfigurations/Deploy_Debug_x86_.xml
index 1a2615c..039fb5a 100644
--- a/.idea/runConfigurations/Deploy_Debug_x86_.xml
+++ b/.idea/runConfigurations/Deploy_Debug_x86_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Deploy_Extra_x64_.xml b/.idea/runConfigurations/Deploy_Extra_x64_.xml
index 01a4d13..b6b3f46 100644
--- a/.idea/runConfigurations/Deploy_Extra_x64_.xml
+++ b/.idea/runConfigurations/Deploy_Extra_x64_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Deploy_Extra_x86_.xml b/.idea/runConfigurations/Deploy_Extra_x86_.xml
index 1943362..bca6430 100644
--- a/.idea/runConfigurations/Deploy_Extra_x86_.xml
+++ b/.idea/runConfigurations/Deploy_Extra_x86_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Deploy_Release_x64_.xml b/.idea/runConfigurations/Deploy_Release_x64_.xml
index 8b46ee9..1e590b7 100644
--- a/.idea/runConfigurations/Deploy_Release_x64_.xml
+++ b/.idea/runConfigurations/Deploy_Release_x64_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Deploy_Release_x86_.xml b/.idea/runConfigurations/Deploy_Release_x86_.xml
index 372b7a7..bdfac8a 100644
--- a/.idea/runConfigurations/Deploy_Release_x86_.xml
+++ b/.idea/runConfigurations/Deploy_Release_x86_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/Distribute_Release_.xml b/.idea/runConfigurations/Distribute_Release_.xml
index 91591e1..d819541 100644
--- a/.idea/runConfigurations/Distribute_Release_.xml
+++ b/.idea/runConfigurations/Distribute_Release_.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="_G_clean" value="false" />
diff --git a/.idea/runConfigurations/spicetools_spice_laa.xml b/.idea/runConfigurations/spicetools_spice_laa.xml
new file mode 100644
index 0000000..8250703
--- /dev/null
+++ b/.idea/runConfigurations/spicetools_spice_laa.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spicetools_spice_laa" type="CMakeRunConfiguration" factoryName="Application" folderName="32" activateToolWindowBeforeRun="false" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="spicetools" TARGET_NAME="spicetools_spice_laa" CONFIG_NAME="Release_x64[WIN_32]" RUN_PATH="/bin/true">
+    <method v="2">
+      <option name="CMake.Explicit.Target" predefinedTargetName="spicetools_stubs_kbt" />
+      <option name="CMake.Explicit.Target" predefinedTargetName="spicetools_stubs_kld" />
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/spicetools_stubs_nvEncodeAPI64.xml b/.idea/runConfigurations/spicetools_stubs_nvEncodeAPI64.xml
new file mode 100644
index 0000000..12bea90
--- /dev/null
+++ b/.idea/runConfigurations/spicetools_stubs_nvEncodeAPI64.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spicetools_stubs_nvEncodeAPI64" type="CMakeRunConfiguration" factoryName="Application" folderName="64" activateToolWindowBeforeRun="false" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="spicetools" TARGET_NAME="spicetools_stubs_nvEncodeAPI64" CONFIG_NAME="Release_x64[WIN_32]" RUN_PATH="/bin/true">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/spicetools_stubs_nvcuda.xml b/.idea/runConfigurations/spicetools_stubs_nvcuda.xml
new file mode 100644
index 0000000..9c6c228
--- /dev/null
+++ b/.idea/runConfigurations/spicetools_stubs_nvcuda.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spicetools_stubs_nvcuda" type="CMakeRunConfiguration" factoryName="Application" folderName="64" activateToolWindowBeforeRun="false" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="spicetools" TARGET_NAME="spicetools_stubs_nvcuda" CONFIG_NAME="Release_x64[WIN_32]" RUN_PATH="/bin/true">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/spicetools_stubs_nvcuvid.xml b/.idea/runConfigurations/spicetools_stubs_nvcuvid.xml
new file mode 100644
index 0000000..dde83a7
--- /dev/null
+++ b/.idea/runConfigurations/spicetools_stubs_nvcuvid.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spicetools_stubs_nvcuvid" type="CMakeRunConfiguration" factoryName="Application" folderName="64" activateToolWindowBeforeRun="false" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="spicetools" TARGET_NAME="spicetools_stubs_nvcuvid" CONFIG_NAME="Release_x64[WIN_32]" RUN_PATH="/bin/true">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cf6ad5..95fe883 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -761,21 +761,3 @@ set_target_properties(spicetools_spice64 spicetools_stubs_kbt64 spicetools_stubs
         ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/archive64"
         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64"
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64")
-
-# force include (temporary)
-function(target_force_include _target)
-    cmake_parse_arguments(_IFORCE "" "" "QUOTE;REL_PATH;ABS_PATH" ${ARGN})
-    get_target_property(_path_root ${_target} SOURCE_DIR)
-    list(TRANSFORM _IFORCE_QUOTE PREPEND "SHELL:-include ")
-    list(TRANSFORM _IFORCE_REL_PATH PREPEND "SHELL:-include ${_path_root}/")
-    list(TRANSFORM _IFORCE_ABS_PATH PREPEND "SHELL:-include ")
-    target_compile_options(${_target} PRIVATE
-            ${_IFORCE_QUOTE} ${_IFORCE_REL_PATH} ${_IFORCE_ABS_PATH})
-endfunction()
-target_force_include(spicetools_spice QUOTE stdint.h)
-target_force_include(spicetools_stubs_kbt QUOTE stdint.h)
-target_force_include(spicetools_stubs_kld QUOTE stdint.h)
-target_force_include(spicetools_spice64 QUOTE stdint.h)
-target_force_include(spicetools_stubs_kbt64 QUOTE stdint.h)
-target_force_include(spicetools_stubs_kld64 QUOTE stdint.h)
-target_force_include(spicetools_cfg QUOTE stdint.h)