Skip to content

Commit daf3424

Browse files
committed
Changes to be committed: - modified: CMakeLists.txt - modified: cfg/SysFtx.cmake.in - new file: cfg/SysFtxCore.cmake.in - modified: cfg/SysInetCore.cmake.in - modified: impl/CMakeLists.txt
1 parent 7b104af commit daf3424

5 files changed

Lines changed: 36 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ if(NOT TARGET ae2f::Sys)
3737
)
3838

3939
target_link_libraries(ae2f-SysCore INTERFACE ae2f::Pat)
40-
add_subdirectory(impl)
4140

4241
# =============================
4342
project(SysThrdCore VERSION 0)
@@ -62,6 +61,21 @@ if(NOT TARGET ae2f::Sys)
6261
endif()
6362

6463
# =============================
64+
65+
project(SysFtxCore VERSION 0)
66+
ae2f_CoreLibTentConfigCustom(
67+
SysFtxCore INTERFACE inc ae2f
68+
${ae2f_ProjRoot}/cfg/SysFtxCore.cmake.in
69+
)
70+
71+
target_link_libraries(ae2f-SysFtxCore INTERFACE ae2f::SysCore)
72+
73+
if(WIN32 OR MINGW OR CYGWIN)
74+
target_link_libraries(ae2f-SysFtxCore INTERFACE Synchronization)
75+
endif()
76+
77+
# =============================
78+
6579
project(SysInetCore VERSION 0)
6680
ae2f_CoreLibTentConfigCustom(
6781
SysInetCore INTERFACE inc ae2f
@@ -73,6 +87,8 @@ if(NOT TARGET ae2f::Sys)
7387
endif()
7488

7589
# =============================
90+
91+
add_subdirectory(impl)
7692
ae2f_CoreLibTentConfigCustom(
7793
Sys INTERFACE inc ae2f
7894
${PROJECT_SOURCE_DIR}/cfg/Sys.cmake.in

cfg/SysFtx.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ include(CMakeFindDependencyMacro)
55
include(CMakePackageConfigHelpers)
66
include("${CMAKE_CURRENT_LIST_DIR}/SysFtxTargets.cmake")
77

8-
find_dependency(SysCore REQUIRED)
9-
link_libraries(ae2f::SysCore)
8+
find_dependency(SysFtxCore REQUIRED)
9+
link_libraries(ae2f::SysFtxCore)

cfg/SysFtxCore.cmake.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@PACKAGE_INIT@
2+
3+
include(CMakeFindDependencyMacro)
4+
5+
include(CMakePackageConfigHelpers)
6+
include("${CMAKE_CURRENT_LIST_DIR}/SysFtxCoreTargets.cmake")
7+
8+
find_dependency(SysCore REQUIRED)
9+
link_libraries(ae2f::SysCore)
10+
11+
if(WIN32 OR MINGW OR CYGWIN)
12+
link_libraries(Synchronization)
13+
endif()

cfg/SysInetCore.cmake.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include(CMakeFindDependencyMacro)
55
include(CMakePackageConfigHelpers)
66
include("${CMAKE_CURRENT_LIST_DIR}/SysInetCoreTargets.cmake")
77

8+
find_dependency(SysCore REQUIRED)
9+
link_libraries(ae2f::SysCore)
10+
811
if(WIN32 OR MINGW OR CYGWIN)
912
link_libraries(ws2_32)
1013
endif()

impl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ae2f_Macro_Lib_V2(
1313
inc ON
1414
)
1515

16-
target_link_libraries(ae2f-SysFtx INTERFACE ae2f::SysCore)
16+
target_link_libraries(ae2f-SysFtx INTERFACE ae2f::SysFtxCore)
1717
ae2f_CoreTestTentVerbose(ae2f-SysFtx ${PROJECT_SOURCE_DIR}/test/ftx)
1818

1919
# =================

0 commit comments

Comments
 (0)