revert: library path

MaaXYZ · May 17, 2024 · b3ddb2a · b3ddb2a
1 parent ad01287
commit b3ddb2a
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 48 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,11 +80,7 @@ if(BUILD_DLOPEN_TESTING)
 endif()
 
 if(USE_MAADEPS)
-    if(WIN32)
-        maadeps_install(bin)
-    else()
-        maadeps_install(lib)
-    endif()
+    maadeps_install(bin)
 endif()
 
 install(

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -30,9 +30,9 @@ else()
 endif()
 
 if(APPLE)
-    set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path;@loader_path/../lib;@executable_path/../lib")
+    set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path")
 elseif(UNIX)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../lib")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
 endif()
 
 set(CMAKE_CXX_STANDARD 20)

diff --git a/source/MaaAdbControlUnit/CMakeLists.txt b/source/MaaAdbControlUnit/CMakeLists.txt
@@ -1,10 +1,10 @@
 file(GLOB_RECURSE maa_adb_control_unit_src *.h *.hpp *.cpp)
-file(GLOB_RECURSE maa_adb_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/AdbControlUnitAPI.h
-     ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
+file(GLOB_RECURSE maa_adb_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/AdbControlUnitAPI.h ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
 
 add_library(MaaAdbControlUnit SHARED ${maa_adb_control_unit_src} ${maa_adb_control_unit_header})
 
-target_include_directories(MaaAdbControlUnit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaAdbControlUnit
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
 target_link_libraries(MaaAdbControlUnit MaaUtils HeaderOnlyLibraries ${OpenCV_LIBS} ZLIB::ZLIB EmulatorExtras)
 
@@ -19,7 +19,9 @@ add_dependencies(MaaAdbControlUnit MaaUtils)
 install(
     TARGETS MaaAdbControlUnit
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib # ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION bin
+
+    # ARCHIVE DESTINATION lib
 )
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_adb_control_unit_src})
diff --git a/source/MaaDbgControlUnit/CMakeLists.txt b/source/MaaDbgControlUnit/CMakeLists.txt
@@ -1,10 +1,10 @@
 file(GLOB_RECURSE maa_dbg_control_unit_src *.h *.hpp *.cpp)
-file(GLOB_RECURSE maa_dbg_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/DbgControlUnitAPI.h
-     ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
+file(GLOB_RECURSE maa_dbg_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/DbgControlUnitAPI.h ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
 
 add_library(MaaDbgControlUnit SHARED ${maa_dbg_control_unit_src} ${maa_dbg_control_unit_header})
 
-target_include_directories(MaaDbgControlUnit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaDbgControlUnit
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
 target_link_libraries(MaaDbgControlUnit MaaUtils HeaderOnlyLibraries ${OpenCV_LIBS})
 
@@ -15,7 +15,9 @@ add_dependencies(MaaDbgControlUnit MaaUtils)
 install(
     TARGETS MaaDbgControlUnit
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib # ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION bin
+
+    # ARCHIVE DESTINATION lib
 )
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_dbg_control_unit_src})
diff --git a/source/MaaFramework/CMakeLists.txt b/source/MaaFramework/CMakeLists.txt
@@ -11,7 +11,7 @@ target_include_directories(
 target_compile_definitions(MaaFramework PRIVATE MAA_FRAMEWORK_EXPORTS)
 
 target_link_libraries(MaaFramework PRIVATE MaaUtils LibraryHolder ${OpenCV_LIBS} fastdeploy_ppocr
-                                           ONNXRuntime::ONNXRuntime HeaderOnlyLibraries)
+    ONNXRuntime::ONNXRuntime HeaderOnlyLibraries)
 
 # clang 15之后有ranges if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") find_package(range-v3 REQUIRED)
 # target_link_libraries(MaaFramework range-v3::range-v3) endif ()
@@ -37,7 +37,7 @@ install(
     TARGETS MaaFramework
     EXPORT MaaFrameworkTargets
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION bin
     ARCHIVE DESTINATION lib)
 install(DIRECTORY "${MAA_PUBLIC_INC}/MaaFramework" DESTINATION "include")
 

diff --git a/source/MaaHttp/CMakeLists.txt b/source/MaaHttp/CMakeLists.txt
@@ -25,7 +25,7 @@ if(NODE_EXE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/LHG/README.md)
         TARGETS MaaHttp
         EXPORT MaaFrameworkTargets
         RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
+        LIBRARY DESTINATION bin
         ARCHIVE DESTINATION lib)
 
     source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_http_src})

diff --git a/source/MaaProjectInterface/CLI/CMakeLists.txt b/source/MaaProjectInterface/CLI/CMakeLists.txt
@@ -3,22 +3,16 @@ file(GLOB_RECURSE maa_pi_cli_header ${MAA_PRIVATE_INC}/MaaPiCli/*)
 
 add_executable(MaaPiCli ${maa_pi_cli_src} ${maa_pi_cli_header})
 
-target_include_directories(MaaPiCli PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaPiCli
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
-target_link_libraries(
-    MaaPiCli
-    ProjectInterface
-    MaaUtils
-    MaaFramework
-    MaaToolkit
-    HeaderOnlyLibraries
-    Boost::system)
+target_link_libraries(MaaPiCli ProjectInterface MaaUtils MaaFramework MaaToolkit HeaderOnlyLibraries Boost::system)
 
 add_dependencies(MaaPiCli ProjectInterface MaaUtils MaaFramework MaaToolkit)
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_pi_cli_src})
 
-install(
-    TARGETS MaaPiCli
+install(TARGETS MaaPiCli
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib)
+    LIBRARY DESTINATION bin
+)
diff --git a/source/MaaThriftControlUnit/CMakeLists.txt b/source/MaaThriftControlUnit/CMakeLists.txt
@@ -1,14 +1,16 @@
-generate_thrift_lib(ThriftControlUnitThrift ${MAA_PUBLIC_INC}/MaaFramework/Instance/ThriftController.thrift
-                    ${CMAKE_CURRENT_BINARY_DIR}/generated maa_thrift_controlunit_thrift_src)
+generate_thrift_lib(
+    ThriftControlUnitThrift
+    ${MAA_PUBLIC_INC}/MaaFramework/Instance/ThriftController.thrift
+    ${CMAKE_CURRENT_BINARY_DIR}/generated
+    maa_thrift_controlunit_thrift_src)
 
 file(GLOB_RECURSE maa_thrift_control_unit_src *.h *.hpp *.cpp)
-file(GLOB_RECURSE maa_thrift_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/ThriftControlUnitAPI.h
-     ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
+file(GLOB_RECURSE maa_thrift_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/ThriftControlUnitAPI.h ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
 
 add_library(MaaThriftControlUnit SHARED ${maa_thrift_control_unit_src} ${maa_thrift_control_unit_header})
 
-target_include_directories(MaaThriftControlUnit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                                                        ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaThriftControlUnit
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
 target_link_libraries(MaaThriftControlUnit MaaUtils ThriftControlUnitThrift HeaderOnlyLibraries ${OpenCV_LIBS})
 
@@ -19,7 +21,9 @@ add_dependencies(ThriftControlUnitThrift MaaUtils)
 install(
     TARGETS MaaThriftControlUnit
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib # ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION bin
+
+    # ARCHIVE DESTINATION lib
 )
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_thrift_control_unit_src})
diff --git a/source/MaaToolkit/CMakeLists.txt b/source/MaaToolkit/CMakeLists.txt
@@ -21,7 +21,7 @@ install(
     TARGETS MaaToolkit
     EXPORT MaaFrameworkTargets
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION bin
     ARCHIVE DESTINATION lib)
 install(DIRECTORY "${MAA_PUBLIC_INC}/MaaToolkit" DESTINATION "include")
 

diff --git a/source/MaaUtils/CMakeLists.txt b/source/MaaUtils/CMakeLists.txt
@@ -2,15 +2,16 @@ file(GLOB_RECURSE maa_utils_src *.h *.hpp *.cpp)
 file(GLOB_RECURSE maa_utils_header ${MAA_PRIVATE_INC}/Utils/*)
 
 add_library(MaaUtils SHARED ${maa_utils_src} ${maa_utils_header})
-target_include_directories(MaaUtils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaUtils
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 target_link_libraries(MaaUtils PRIVATE HeaderOnlyLibraries Boost::system ${OpenCV_LIBS})
 target_compile_definitions(MaaUtils PRIVATE MAA_UTILS_EXPORTS)
 
 install(
     TARGETS MaaUtils
     EXPORT MaaFrameworkTargets
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib # ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION bin # ARCHIVE DESTINATION lib
 )
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_utils_src})
diff --git a/source/MaaWin32ControlUnit/CMakeLists.txt b/source/MaaWin32ControlUnit/CMakeLists.txt
@@ -1,10 +1,10 @@
 file(GLOB_RECURSE maa_win32_control_unit_src *.h *.hpp *.cpp)
-file(GLOB_RECURSE maa_win32_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/Win32ControlUnitAPI.h
-     ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
+file(GLOB_RECURSE maa_win32_control_unit_header ${MAA_PRIVATE_INC}/ControlUnit/Win32ControlUnitAPI.h ${MAA_PRIVATE_INC}/ControlUnit/ControlUnitAPI.h)
 
 add_library(MaaWin32ControlUnit SHARED ${maa_win32_control_unit_src} ${maa_win32_control_unit_header})
 
-target_include_directories(MaaWin32ControlUnit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
+target_include_directories(MaaWin32ControlUnit
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
 target_link_libraries(MaaWin32ControlUnit MaaUtils HeaderOnlyLibraries ${OpenCV_LIBS} ZLIB::ZLIB Boost::system)
 target_link_libraries(MaaWin32ControlUnit d3d11 dxgi)
@@ -16,7 +16,9 @@ add_dependencies(MaaWin32ControlUnit MaaUtils)
 install(
     TARGETS MaaWin32ControlUnit
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib # ARCHIVE DESTINATIONsave lib
+    LIBRARY DESTINATION bin
+
+    # ARCHIVE DESTINATION lib
 )
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_win32_control_unit_src})
diff --git a/source/binding/Python/maa/__init__.py b/source/binding/Python/maa/__init__.py
@@ -1,9 +1,8 @@
 import os
-import platform
 
 from .library import Library
 
-__PATH = os.path.join(os.path.dirname(__file__), "bin" if platform.system() == "Windows" else "lib")
+__PATH = os.path.join(os.path.dirname(__file__), "bin")
 
 if os.path.exists(__PATH):
     ver = Library.open(__PATH)

diff --git a/test/python/binding_test.py b/test/python/binding_test.py
@@ -2,7 +2,6 @@
 from typing import Tuple
 import sys
 import asyncio
-import platform
 
 if len(sys.argv) < 2:
     print("Usage: python binding_test.py <install_dir>")
@@ -74,7 +73,7 @@ def stop(self) -> None:
 
 
 async def main():
-    version = Library.open(install_dir / ("bin" if platform.system() == "Windows" else "lib"))
+    version = Library.open(install_dir / "bin")
     print(f"MaaFw Version: {version}")
 
     Toolkit.init_option(install_dir / "bin")