tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index d04794e..b686747 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -10,11 +10,6 @@ set(CMAKE_CXX_STANDARD 17)
6 set(CMAKE_CXX_STANDARD_REQUIRED ON)
7 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
8
9-#在这里配置QT路径 例如 D:/Qt/6.6.2/msvc2019_64 D:/Qt/5.15.2/msvc2019_64 /home/liniyous/Qt/5.15.2/gcc_64
10-SET(QT_SDK_DIR D:/Qt/5.15.2/msvc2019_64 CACHE PATH "QT SDK DIR" FORCE)
11-message("在CMAKE中配置 QT_SDK_DIR 选项指定QT路径; 当前路径: ${QT_SDK_DIR}")
12-SET(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/Install CACHE PATH "Installation path" FORCE)
13-
14 option(BUILD_ELAPACKETIO "Build ElaPacketIO" OFF)
15 list(APPEND CMAKE_PREFIX_PATH ${QT_SDK_DIR})
16
17diff --git a/ElaWidgetTools/CMakeLists.txt b/ElaWidgetTools/CMakeLists.txt
18index 0f61edd..7b075f1 100644
19--- a/ElaWidgetTools/CMakeLists.txt
20+++ b/ElaWidgetTools/CMakeLists.txt
21@@ -46,9 +46,9 @@ if (MSVC)
22 set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "d")
23 endif ()
24
25-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
26-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
27-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
28+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
29+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
30+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
31 target_link_libraries(${PROJECT_NAME} PUBLIC
32 Qt${QT_VERSION_MAJOR}::Widgets
33 )
34@@ -63,13 +63,6 @@ endif ()
35 install(
36 TARGETS ${PROJECT_NAME}
37 EXPORT ${PROJECT_NAME}
38- ARCHIVE DESTINATION ${PROJECT_NAME}/lib
39- LIBRARY DESTINATION ${PROJECT_NAME}/lib
40- RUNTIME DESTINATION ${PROJECT_NAME}/bin
41-)
42-install(TARGETS ${PROJECT_NAME}
43- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample
44- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample
45 )
46 if (MSVC AND NOT LIB_TYPE STREQUAL "STATIC")
47 install(
48@@ -87,7 +80,7 @@ set(LIB_DIR lib)
49 install(
50 EXPORT ${PROJECT_NAME}
51 FILE ${PROJECT_NAME}Targets.cmake
52- DESTINATION ${PROJECT_NAME}/lib/cmake
53+ DESTINATION lib/cmake
54 )
55
56 include(CMakePackageConfigHelpers)
57@@ -102,7 +95,6 @@ configure_package_config_file(
58 ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
59 INSTALL_DESTINATION lib/cmake
60 PATH_VARS INCLUDE_DIRS LIBRARIES LIB_DIR
61- INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
62 )
63
64 install(
65diff --git a/ElaWidgetToolsExample/CMakeLists.txt b/ElaWidgetToolsExample/CMakeLists.txt
66index 7330ed1..3cd0cc7 100644
67--- a/ElaWidgetToolsExample/CMakeLists.txt
68+++ b/ElaWidgetToolsExample/CMakeLists.txt
69@@ -41,9 +41,9 @@ else ()
70 )
71 endif ()
72
73-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
74-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
75-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
76+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
77+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
78+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
79
80 if (WIN32)
81 target_include_directories(${PROJECT_NAME} PUBLIC
82@@ -93,8 +93,6 @@ endif ()
83
84 include(GNUInstallDirs)
85 install(TARGETS ${PROJECT_NAME}
86- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
87- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
88 )
89 if (MSVC)
90 install(