Use CMAKE_RUNTIME_OUTPUT_DIRECTORY to simplify build directory struct…

…ure (#1258)
fcitx · Feb 3, 2025 · a7f5bd1 · a7f5bd1
1 parent 1a6ca37
commit a7f5bd1
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,6 +204,10 @@ get_filename_component(CMAKE_INSTALL_FULL_LIBDATADIR "${CMAKE_INSTALL_LIBDATADIR
 mark_as_advanced(CMAKE_INSTALL_LIBDATADIR)
 mark_as_advanced(CMAKE_INSTALL_FULL_LIBDATADIR)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 include(Fcitx5CompilerSettings)
 
 set(FCITX_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -60,7 +60,7 @@ if (ENABLE_DBUS)
 
         if (DBUS_DAEMON_BIN)
             add_test(NAME ${TESTCASE}
-                    COMMAND DBusWrapper "${DBUS_DAEMON_BIN}" "${CMAKE_CURRENT_BINARY_DIR}/${TESTCASE}" ${${TESTCASE}_ARGS})
+                    COMMAND DBusWrapper "${DBUS_DAEMON_BIN}" "$<TARGET_FILE:${TESTCASE}>" ${${TESTCASE}_ARGS})
         endif()
     endforeach()
 endif()

diff --git a/test/testaddon.cpp b/test/testaddon.cpp
@@ -7,6 +7,7 @@
 
 #include "fcitx-utils/log.h"
 #include "fcitx-utils/metastring.h"
+#include "fcitx-utils/testing.h"
 #include "fcitx/addoninstance.h"
 #include "fcitx/addonmanager.h"
 #include "addon/dummyaddon_public.h"
@@ -16,9 +17,8 @@ double f(int) { return 0; }
 
 int main() {
     fcitx::Log::setLogRule("default=5");
-    setenv("SKIP_FCITX_PATH", "1", 1);
-    setenv("XDG_DATA_DIRS", FCITX5_SOURCE_DIR "/test/addon2", 1);
-    setenv("FCITX_ADDON_DIRS", FCITX5_BINARY_DIR "/test/addon", 1);
+    fcitx::setupTestingEnvironment(FCITX5_BINARY_DIR, {"bin"},
+                                   {FCITX5_SOURCE_DIR "/test/addon2/fcitx5"});
     fcitx::AddonManager manager;
     manager.registerDefaultLoader(nullptr);
     manager.load();

diff --git a/test/testcompose.cpp b/test/testcompose.cpp
@@ -81,9 +81,7 @@ constexpr char testCompose[] = {
     "BELOW\n"};
 
 int main() {
-    setupTestingEnvironment(FCITX5_BINARY_DIR,
-                            {"testing/testfrontend", "testing/testui"},
-                            {"test"});
+    setupTestingEnvironment(FCITX5_BINARY_DIR, {"bin"}, {"test"});
 
     char arg0[] = "testcompose";
     char arg1[] = "--disable=all";

diff --git a/test/testdbusmessage.cpp b/test/testdbusmessage.cpp
@@ -5,44 +5,49 @@
  *
  */
 #include <unistd.h>
+#include <cstdint>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <vector>
 #include "fcitx-utils/dbus/bus.h"
 #include "fcitx-utils/dbus/message.h"
 #include "fcitx-utils/dbus/variant.h"
 #include "fcitx-utils/log.h"
-#include "fcitx-utils/metastring.h"
+#include "fcitx-utils/unixfd.h"
 
 using namespace fcitx::dbus;
 using namespace fcitx;
 
 int main() {
     Bus bus(BusType::Session);
 
-    static_assert(std::is_same<DBusSignatureToType<'i', 'u'>::type,
-                               std::tuple<int32_t, uint32_t>>::value,
+    static_assert(std::is_same_v<DBusSignatureToType<'i', 'u'>::type,
+                                 std::tuple<int32_t, uint32_t>>,
                   "Type is not same");
-    static_assert(std::is_same<DBusSignatureToType<'i'>::type, int32_t>::value,
+    static_assert(std::is_same_v<DBusSignatureToType<'i'>::type, int32_t>,
                   "Type is not same");
-    static_assert(std::is_same<DBusSignatureToType<'a', 'u'>::type,
-                               std::vector<uint32_t>>::value,
+    static_assert(std::is_same_v<DBusSignatureToType<'a', 'u'>::type,
+                                 std::vector<uint32_t>>,
                   "Type is not same");
     static_assert(
-        std::is_same<DBusSignatureToType<'a', '(', 'i', 'u', ')'>::type,
-                     std::vector<DBusStruct<int32_t, uint32_t>>>::value,
+        std::is_same_v<DBusSignatureToType<'a', '(', 'i', 'u', ')'>::type,
+                       std::vector<DBusStruct<int32_t, uint32_t>>>,
         "Type is not same");
     static_assert(
-        std::is_same<
+        std::is_same_v<
             DBusSignatureToType<'a', 'i', 'a', '(', 'i', 'u', ')'>::type,
             std::tuple<std::vector<int32_t>,
-                       std::vector<DBusStruct<int32_t, uint32_t>>>>::value,
+                       std::vector<DBusStruct<int32_t, uint32_t>>>>,
         "Type is not same");
     static_assert(
-        std::is_same<DBusSignatureToType<'a', 'i', '(', 'i', 'u', ')'>::type,
-                     std::tuple<std::vector<int32_t>,
-                                DBusStruct<int32_t, uint32_t>>>::value,
+        std::is_same_v<
+            DBusSignatureToType<'a', 'i', '(', 'i', 'u', ')'>::type,
+            std::tuple<std::vector<int32_t>, DBusStruct<int32_t, uint32_t>>>,
         "Type is not same");
 
-    static_assert(std::is_same<DBusSignatureToType<'(', 'i', 'i', ')'>::type,
-                               dbus::DBusStruct<int32_t, int32_t>>::value,
+    static_assert(std::is_same_v<DBusSignatureToType<'(', 'i', 'i', ')'>::type,
+                                 dbus::DBusStruct<int32_t, int32_t>>,
                   "Type is not same");
 
     static_assert(

diff --git a/test/testemoji.cpp b/test/testemoji.cpp
@@ -16,7 +16,7 @@ using namespace fcitx;
 
 int main() {
     setupTestingEnvironment(
-        FCITX5_BINARY_DIR, {"src/modules/emoji"},
+        FCITX5_BINARY_DIR, {"bin"},
         {"test", "src/modules", FCITX5_SOURCE_DIR "/src/modules"});
     AddonManager manager(FCITX5_BINARY_DIR "/src/modules/emoji");
     manager.registerDefaultLoader(nullptr);

diff --git a/test/testinputcontext.cpp b/test/testinputcontext.cpp
@@ -335,9 +335,7 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
 
 void test_custom_panel() {
 
-    setupTestingEnvironment(FCITX5_BINARY_DIR,
-                            {"testing/testfrontend", "testing/testui"},
-                            {"test"});
+    setupTestingEnvironment(FCITX5_BINARY_DIR, {"bin"}, {"test"});
 
     char arg0[] = "testcompose";
     char arg1[] = "--disable=all";

diff --git a/test/testinstance.cpp b/test/testinstance.cpp
@@ -117,9 +117,7 @@ void testModifierOnlyHotkey(Instance &instance) {
 }
 
 int main() {
-    setupTestingEnvironment(FCITX5_BINARY_DIR,
-                            {"testing/testim", "testing/testfrontend"},
-                            {"test"});
+    setupTestingEnvironment(FCITX5_BINARY_DIR, {"bin"}, {"test"});
 
     char arg0[] = "testinstance";
     char arg1[] = "--disable=all";

diff --git a/test/testquickphrase.cpp b/test/testquickphrase.cpp
@@ -219,9 +219,7 @@ void testRestoreCallback(Instance *instance) {
 
 int main() {
     setupTestingEnvironment(
-        FCITX5_BINARY_DIR,
-        {"src/modules/quickphrase", "testing/testfrontend", "testing/testui",
-         "testing/testim"},
+        FCITX5_BINARY_DIR, {"bin"},
         {"test", "src/modules", FCITX5_SOURCE_DIR "/test/addon/fcitx5"});
 
     char arg0[] = "testquickphrase";

diff --git a/test/testspell.cpp b/test/testspell.cpp
@@ -68,9 +68,7 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
 
 int main() {
     setupTestingEnvironment(
-        FCITX5_BINARY_DIR,
-        {"src/modules/spell", "testing/testfrontend", "testing/testui",
-         "testing/testim"},
+        FCITX5_BINARY_DIR, {"bin"},
         {"test", "src/modules", FCITX5_SOURCE_DIR "/src/modules"});
 
     char arg0[] = "testspell";

diff --git a/test/testunicode.cpp b/test/testunicode.cpp
@@ -78,9 +78,7 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
 
 int main() {
     setupTestingEnvironment(
-        FCITX5_BINARY_DIR,
-        {"src/modules/unicode", "testing/testfrontend", "testing/testui",
-         "testing/testim"},
+        FCITX5_BINARY_DIR, {"bin"},
         {"test", "src/modules", FCITX5_SOURCE_DIR "/src/modules"});
 
     char arg0[] = "testunicode";

diff --git a/test/testxim.cpp b/test/testxim.cpp
@@ -159,9 +159,7 @@ class XIMTest {
 int main() {
     setenv("XMODIFIERS", xmodifiers, 1);
     setupTestingEnvironment(
-        FCITX5_BINARY_DIR,
-        {"src/modules/quickphrase", "src/frontend/xim", "src/modules/xcb",
-         "testing/testui", "testing/testim"},
+        FCITX5_BINARY_DIR, {"bin"},
         {"test", "src/modules", FCITX5_SOURCE_DIR "/test/addon/fcitx5"});
 
     char arg0[] = "testquickphrase";