refactor: 调整CMakeLists.txt

src/core/CMakeLists.txt

@@ -32,9 +32,9 @@ foreach(tgt core-shared core-static)
     define_FILENAME(${tgt})
 endforeach()
 
-#set_target_properties(core-shared PROPERTIES OUTPUT_NAME "aFuncore")
-#set_target_properties(core-static PROPERTIES OUTPUT_NAME "aFuncore-s")
-#
+set_target_properties(core-shared PROPERTIES OUTPUT_NAME "aFuncore")
+set_target_properties(core-static PROPERTIES OUTPUT_NAME "aFuncore-s")
+
 target_link_libraries(core-shared PUBLIC tool-shared)
 target_link_libraries(core-static PUBLIC tool-static)
 #

src/interface/CMakeLists.txt

@@ -44,10 +44,10 @@ set_target_properties(rt-static PROPERTIES OUTPUT_NAME "aFunit-s")
 target_link_libraries(rt-shared PUBLIC core-shared)
 target_link_libraries(rt-static PUBLIC core-static)
 
-install(TARGETS rt-shared rt-static
-        EXPORT aFunlang
-        RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT base-runtime
-        ARCHIVE DESTINATION ${INSTALL_LIBDIR} COMPONENT dev
-        LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT base-runtime
-        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT dev
-        PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT advanced-dev)
+#install(TARGETS rt-shared rt-static
+#        EXPORT aFunlang
+#        RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT base-runtime
+#        ARCHIVE DESTINATION ${INSTALL_LIBDIR} COMPONENT dev
+#        LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT base-runtime
+#        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT dev
+#        PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT advanced-dev)

src/tool/CMakeLists.txt

@@ -29,19 +29,18 @@ add_library(tool-static STATIC "")
 # 基础宏定义
 set(definitions)
 if (WIN32 OR CYGWIN)
-    list(APPEND definitions AFUN_WIN32=1)
+    list(APPEND definitions AFUN_WIN32)
 endif()
 if (WIN32 AND NOT CYGWIN)
-    list(APPEND definitions AFUN_WIN32_NO_CYGWIN=1)
+    list(APPEND definitions AFUN_WIN32_NO_CYGWIN)
 endif()
 if (CYGWIN)
-    list(APPEND definitions AFUN_CYGWIN=1)
+    list(APPEND definitions AFUN_CYGWIN)
 endif()
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
-    list(APPEND definitions AFUN_DEBUG=1)
+    list(APPEND definitions AFUN_DEBUG)
 endif()
 
-
 foreach(tgt tool-shared tool-static)
     target_sources(${tgt} PRIVATE ${source} ${private_h} PUBLIC ${public_h_build} ${public_h_install})
     target_include_directories(${tgt} PUBLIC ${build_include} ${install_include})
@@ -57,19 +56,17 @@ foreach(tgt tool-shared tool-static)
                 AFUN_STATIC_SUFFIX="${CMAKE_STATIC_LIBRARY_SUFFIX}"
                 AFUN_EXE_SUFFIX="${CMAKE_EXECUTABLE_SUFFIX}")
     set_target_properties(${tgt} PROPERTIES PUBLIC_HEADER "${public_h_build}")
+    target_link_libraries(${tgt} PUBLIC ${dlfcn_lib} PCRE2::8BIT Threads::Threads)
     define_FILENAME(${tgt})
 endforeach()
 
-target_link_libraries(tool-shared PUBLIC ${dlfcn_lib} PCRE2::8BIT Threads::Threads)
-target_link_libraries(tool-static PUBLIC ${dlfcn_lib} PCRE2::8BIT Threads::Threads)
-
 set_target_properties(tool-shared PROPERTIES OUTPUT_NAME "aFuntool")
 set_target_properties(tool-static PROPERTIES OUTPUT_NAME "aFuntool-s")
 
-install(TARGETS tool-shared tool-static
-        EXPORT aFunlang
-        RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT runtime
-        ARCHIVE DESTINATION ${INSTALL_LIBDIR} COMPONENT dev
-        LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT runtime
-        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT dev
-        PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT unsafe-dev)
+#install(TARGETS tool-shared tool-static
+#        EXPORT aFunlang
+#        RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT runtime
+#        ARCHIVE DESTINATION ${INSTALL_LIBDIR} COMPONENT dev
+#        LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT runtime
+#        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT dev
+#        PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT unsafe-dev)