Skip to content

Commit 1bd7ad9

Browse files
starseekerstarseeker
committed
Remove includes of other lib src directories
1 parent bc96f29 commit 1bd7ad9

5 files changed

Lines changed: 15 additions & 32 deletions

File tree

‎src/cldai/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
set(LIBSTEPDAI_SRCS
1+
set(DAI_SRCS
32
sdaiApplication_instance_set.cc
43
sdaiBinary.cc
54
sdaiDaObject.cc
@@ -16,21 +15,19 @@ set(LIBSTEPDAI_SRCS
1615
include_directories(
1716
${CMAKE_CURRENT_SOURCE_DIR}
1817
${CMAKE_SOURCE_DIR}/include/stepcode
19-
${SC_SOURCE_DIR}/src/clstepcore
20-
${SC_SOURCE_DIR}/src/clutils
2118
)
2219

2320
set(_libdeps steputils)
2421

2522
if(BUILD_SHARED_LIBS)
26-
SC_ADDLIB(stepdai SHARED SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES ${_libdeps})
23+
SC_ADDLIB(stepdai SHARED SOURCES ${DAI_SRCS} LINK_LIBRARIES ${_libdeps})
2724
if(WIN32)
2825
target_compile_definitions(stepdai PRIVATE SC_DAI_DLL_EXPORTS)
2926
endif()
3027
endif()
3128

3229
if(BUILD_STATIC_LIBS)
33-
SC_ADDLIB(stepdai-static STATIC SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static >-static)
30+
SC_ADDLIB(stepdai-static STATIC SOURCES ${DAI_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static >-static)
3431
endif()
3532

3633
# Local Variables:

‎src/cleditor/CMakeLists.txt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
set(LIBSTEPEDITOR_SRCS
1+
set(EDITOR_SRCS
32
STEPfile.cc
43
STEPfile.inline.cc
54
cmdmgr.cc
@@ -12,20 +11,17 @@ set(LIBSTEPEDITOR_SRCS
1211
include_directories(
1312
${CMAKE_CURRENT_SOURCE_DIR}
1413
${CMAKE_SOURCE_DIR}/include/stepcode
15-
${SC_SOURCE_DIR}/src/cldai
16-
${SC_SOURCE_DIR}/src/clstepcore
17-
${SC_SOURCE_DIR}/src/clutils
1814
)
1915

2016
if(BUILD_SHARED_LIBS)
21-
SC_ADDLIB(stepeditor SHARED SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils)
17+
SC_ADDLIB(stepeditor SHARED SOURCES ${EDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils)
2218
if(WIN32)
2319
target_compile_definitions(stepeditor PRIVATE SC_EDITOR_DLL_EXPORTS)
2420
endif()
2521
endif()
2622

2723
if(BUILD_STATIC_LIBS)
28-
SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static)
24+
SC_ADDLIB(stepeditor-static STATIC SOURCES ${EDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static)
2925
endif()
3026

3127
# Local Variables:

‎src/cllazyfile/CMakeLists.txt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
set( clLazyFile_SRCS
1+
set(LAZY_SRCS
32
lazyDataSectionReader.cc
43
lazyFileReader.cc
54
lazyInstMgr.cc
@@ -12,24 +11,20 @@ set( clLazyFile_SRCS
1211
include_directories(
1312
${CMAKE_CURRENT_SOURCE_DIR}
1413
${CMAKE_SOURCE_DIR}/include/stepcode
15-
${SC_SOURCE_DIR}/src/cleditor
16-
${SC_SOURCE_DIR}/src/cldai
17-
${SC_SOURCE_DIR}/src/clstepcore
18-
${SC_SOURCE_DIR}/src/clutils
1914
)
2015

2116
set(_libdeps stepcore stepdai steputils stepeditor)
2217

2318
if(BUILD_SHARED_LIBS)
24-
SC_ADDLIB(steplazyfile SHARED SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps})
19+
SC_ADDLIB(steplazyfile SHARED SOURCES ${LAZY_SRCS} LINK_LIBRARIES ${_libdeps})
2520
if(WIN32)
2621
target_compile_definitions(steplazyfile PRIVATE SC_LAZYFILE_DLL_EXPORTS)
2722
endif()
2823
endif()
2924

3025
if(BUILD_STATIC_LIBS)
3126
set(_libdeps stepcore-static stepdai-static steputils-static stepeditor-static)
32-
SC_ADDLIB(steplazyfile-static STATIC SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps})
27+
SC_ADDLIB(steplazyfile-static STATIC SOURCES ${LAZY_SRCS} LINK_LIBRARIES ${_libdeps})
3328
endif()
3429

3530
SC_ADDEXEC(lazy_test SOURCES "lazy_test.cc;sc_benchmark.cc" LINK_LIBRARIES steplazyfile stepeditor NO_INSTALL)

‎src/clstepcore/CMakeLists.txt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
set(LIBSTEPCORE_SRCS
1+
set(CORE_SRCS
32
aggrTypeDescriptor.cc
43
attrDescriptor.cc
54
attrDescriptorList.cc
@@ -65,22 +64,19 @@ set(LIBSTEPCORE_SRCS
6564
include_directories(
6665
${CMAKE_CURRENT_SOURCE_DIR}
6766
${CMAKE_SOURCE_DIR}/include/stepcode
68-
${SC_SOURCE_DIR}/src/cldai
69-
${SC_SOURCE_DIR}/src/cleditor
70-
${SC_SOURCE_DIR}/src/clutils
7167
)
7268

7369
set(_libdeps steputils stepdai)
7470

7571
if(BUILD_SHARED_LIBS)
76-
SC_ADDLIB(stepcore SHARED SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES ${_libdeps})
72+
SC_ADDLIB(stepcore SHARED SOURCES ${CORE_SRCS} LINK_LIBRARIES ${_libdeps})
7773
if(WIN32)
7874
target_compile_definitions(stepcore PRIVATE SC_CORE_DLL_EXPORTS)
7975
endif()
8076
endif()
8177

8278
if(BUILD_STATIC_LIBS)
83-
SC_ADDLIB(stepcore-static STATIC SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static>-static)
79+
SC_ADDLIB(stepcore-static STATIC SOURCES ${CORE_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static>-static)
8480
endif()
8581

8682
if(SC_ENABLE_TESTING)

‎src/clutils/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(LIBSTEPUTILS_SRCS
1+
set(UTILS_SRCS
22
Str.cc
33
dirobj.cc
44
gennode.cc
@@ -11,19 +11,18 @@ set(LIBSTEPUTILS_SRCS
1111
include_directories(
1212
${SC_BINARY_DIR}/include
1313
${CMAKE_CURRENT_SOURCE_DIR}
14-
${CMAKE_SOURCE_DIR}/include/stepcode
1514
)
1615

1716
if(BUILD_SHARED_LIBS)
18-
SC_ADDLIB(steputils SHARED SOURCES ${LIBSTEPUTILS_SRCS})
17+
SC_ADDLIB(steputils SHARED SOURCES ${UTILS_SRCS})
1918
if(WIN32)
2019
target_compile_definitions(steputils PRIVATE SC_UTILS_DLL_EXPORTS)
2120
target_link_libraries(steputils shlwapi)
2221
endif()
2322
endif()
2423

2524
if(BUILD_STATIC_LIBS)
26-
SC_ADDLIB(steputils-static STATIC SOURCES ${LIBSTEPUTILS_SRCS})
25+
SC_ADDLIB(steputils-static STATIC SOURCES ${UTILS_SRCS})
2726
if(WIN32)
2827
target_link_libraries(steputils-static shlwapi)
2928
endif()

0 commit comments

Comments
 (0)