Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include all EIPScanner files based on library-path #115

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
052df80
Added build directories to the .gitignore
jan-ati Sep 10, 2024
194da53
Began updating library include paths to use the root directory
jan-ati Sep 10, 2024
3d15fe9
Changed header paths to be the full path from the base directory
jan-ati Sep 11, 2024
044f63f
Updates all include paths to be the full paths to the source of the E…
jan-ati Sep 11, 2024
f24f0f1
Created libraries for all of the submodules and linked them to the pa…
jan-ati Sep 11, 2024
7a437fc
Moved the EIPScanner files to a root EIPScanner directory so that all…
jan-ati Sep 11, 2024
1d29b69
Updated the examples projects to use the full project path
jan-ati Sep 11, 2024
c7a5f77
Updated the paths for the testing files to use the root directory of …
jan-ati Sep 11, 2024
10aa69e
Updated the paths in the testing files to use the full paths of EIPSc…
jan-ati Sep 11, 2024
f7bb13e
Build the examples targets when the option is set
jan-ati Sep 24, 2024
0dbd377
Updated lingering include paths for the EIPScanner/vendor files
jan-ati Sep 25, 2024
32bb5da
Update CMakeLists.txt
jan-ati Sep 26, 2024
bc88252
Added back CMakeLists lines that actually installed the shared librar…
jan-ati Sep 26, 2024
2a5cc4d
Changed the default installation for the header files to only be the …
Sep 26, 2024
450758e
Modified the CMakeLists.txt files to include the sources of every sub…
jan-ati Sep 26, 2024
d2a0c50
Added the teknic vendor sources
jan-ati Sep 27, 2024
9a64903
Merge pull request #2 from ATIinc/EN-426-fix-EIPScanner-include-paths…
jan-ati Oct 2, 2024
b6f4faf
Merge pull request #1 from ATIinc/EN-426-fix-EIPScanner-include-paths
jan-ati Oct 2, 2024
a635b30
Update MessageRouter.cpp
jan-ati Oct 7, 2024
4d96bca
Removed the teknic vendor source files
Oct 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modified the CMakeLists.txt files to include the sources of every sub…
…-directory without needing to create sub-libraries and link them
  • Loading branch information
jan-ati committed Sep 26, 2024
commit 450758ef6854be892761e1d84a5b36b61658a7e4
5 changes: 3 additions & 2 deletions src/EIPScanner/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ add_subdirectory(utils)

# if vendor scripts are enabled
if(ENABLE_VENDOR_SRC)
add_subdirectory(vendor)
add_subdirectory(vendor/ra)
add_subdirectory(vendor/yaskawa)
endif()


Expand All @@ -46,5 +47,5 @@ install(TARGETS EIPScanner EIPScannerS
DESTINATION lib)

install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/
DESTINATION include/
DESTINATION include
FILES_MATCHING PATTERN "*.h*")
18 changes: 8 additions & 10 deletions src/EIPScanner/cip/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
set(SOURCE_FILES
CipRevision.cpp
EPath.cpp
MessageRouterRequest.cpp
MessageRouterResponse.cpp
CipString.cpp)
${CMAKE_CURRENT_LIST_DIR}/CipRevision.cpp
${CMAKE_CURRENT_LIST_DIR}/EPath.cpp
${CMAKE_CURRENT_LIST_DIR}/MessageRouterRequest.cpp
${CMAKE_CURRENT_LIST_DIR}/MessageRouterResponse.cpp
${CMAKE_CURRENT_LIST_DIR}/CipString.cpp)

add_subdirectory(connectionManager)

add_library(EIPScannerCip SHARED ${SOURCE_FILES})
add_library(EIPScannerCipS STATIC ${SOURCE_FILES})
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScannerS PUBLIC ${SOURCE_FILES})

target_link_libraries(EIPScannerCip EIPScanner)
target_link_libraries(EIPScannerCipS EIPScannerS)
add_subdirectory(connectionManager)
17 changes: 7 additions & 10 deletions src/EIPScanner/cip/connectionManager/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
set(SOURCE_FILES
ForwardCloseRequest.cpp
ForwardOpenRequest.cpp
LargeForwardOpenRequest.cpp
ForwardOpenResponse.cpp
NetworkConnectionParametersBuilder.cpp)
${CMAKE_CURRENT_LIST_DIR}/ForwardCloseRequest.cpp
${CMAKE_CURRENT_LIST_DIR}/ForwardOpenRequest.cpp
${CMAKE_CURRENT_LIST_DIR}/LargeForwardOpenRequest.cpp
${CMAKE_CURRENT_LIST_DIR}/ForwardOpenResponse.cpp
${CMAKE_CURRENT_LIST_DIR}/NetworkConnectionParametersBuilder.cpp)

add_library(EIPScannerCipConnectionManager SHARED ${SOURCE_FILES})
add_library(EIPScannerCipConnectionManagerS STATIC ${SOURCE_FILES})

target_link_libraries(EIPScannerCipConnectionManager EIPScanner)
target_link_libraries(EIPScannerCipConnectionManagerS EIPScannerS)
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScannerS PUBLIC ${SOURCE_FILES})
17 changes: 7 additions & 10 deletions src/EIPScanner/eip/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
set(SOURCE_FILES
CommonPacket.cpp
CommonPacketItem.cpp
CommonPacketItemFactory.cpp
EncapsPacket.cpp
EncapsPacketFactory.cpp)
${CMAKE_CURRENT_LIST_DIR}/CommonPacket.cpp
${CMAKE_CURRENT_LIST_DIR}/CommonPacketItem.cpp
${CMAKE_CURRENT_LIST_DIR}/CommonPacketItemFactory.cpp
${CMAKE_CURRENT_LIST_DIR}/EncapsPacket.cpp
${CMAKE_CURRENT_LIST_DIR}/EncapsPacketFactory.cpp)

add_library(EIPScannerEip SHARED ${SOURCE_FILES})
add_library(EIPScannerEipS STATIC ${SOURCE_FILES})

target_link_libraries(EIPScannerEip EIPScanner)
target_link_libraries(EIPScannerEipS EIPScannerS)
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScannerS PUBLIC ${SOURCE_FILES})
19 changes: 8 additions & 11 deletions src/EIPScanner/fileObject/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
set(SOURCE_FILES
FileObjectEmptyState.cpp
FileObjectLoadedState.cpp
FileObjectNonExistentState.cpp
FileObjectState.cpp
FileObjectUploadInProgressState.cpp)

add_library(EIPScannerFileObject SHARED ${SOURCE_FILES})
add_library(EIPScannerFileObjectS STATIC ${SOURCE_FILES})

target_link_libraries(EIPScannerFileObject EIPScanner)
target_link_libraries(EIPScannerFileObjectS EIPScannerS)
${CMAKE_CURRENT_LIST_DIR}/FileObjectEmptyState.cpp
${CMAKE_CURRENT_LIST_DIR}/FileObjectLoadedState.cpp
${CMAKE_CURRENT_LIST_DIR}/FileObjectNonExistentState.cpp
${CMAKE_CURRENT_LIST_DIR}/FileObjectState.cpp
${CMAKE_CURRENT_LIST_DIR}/FileObjectUploadInProgressState.cpp)

target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScannerS PUBLIC ${SOURCE_FILES})
20 changes: 9 additions & 11 deletions src/EIPScanner/sockets/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
set(SOURCE_FILES
BaseSocket.cpp
EndPoint.cpp
TCPSocket.cpp
UDPBoundSocket.cpp
UDPSocket.cpp
Platform.cpp)
${CMAKE_CURRENT_LIST_DIR}/BaseSocket.cpp
${CMAKE_CURRENT_LIST_DIR}/EndPoint.cpp
${CMAKE_CURRENT_LIST_DIR}/TCPSocket.cpp
${CMAKE_CURRENT_LIST_DIR}/UDPBoundSocket.cpp
${CMAKE_CURRENT_LIST_DIR}/UDPSocket.cpp
${CMAKE_CURRENT_LIST_DIR}/Platform.cpp)

add_library(EIPScannerSocket SHARED ${SOURCE_FILES})
add_library(EIPScannerSocketS STATIC ${SOURCE_FILES})

target_link_libraries(EIPScannerSocket EIPScanner)
target_link_libraries(EIPScannerSocketS EIPScannerS)

target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
12 changes: 5 additions & 7 deletions src/EIPScanner/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
set(SOURCE_FILES
Logger.cpp
Buffer.cpp)
${CMAKE_CURRENT_LIST_DIR}/Logger.cpp
${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp)

add_library(EIPScannerUtil SHARED ${SOURCE_FILES})
add_library(EIPScannerUtilS STATIC ${SOURCE_FILES})

target_link_libraries(EIPScannerUtil EIPScanner)
target_link_libraries(EIPScannerUtilS EIPScannerS)

target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
17 changes: 0 additions & 17 deletions src/EIPScanner/vendor/CMakeLists.txt

This file was deleted.

8 changes: 8 additions & 0 deletions src/EIPScanner/vendor/ra/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
set(SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultManager.cpp
${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultObject.cpp
${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultCode.cpp
${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultParameter.cpp)

target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
7 changes: 7 additions & 0 deletions src/EIPScanner/vendor/yaskawa/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set(SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_EPath.cpp
${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouter.cpp
${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouterRequest.cpp)

target_sources(EIPScanner PUBLIC ${SOURCE_FILES})
target_sources(EIPScanner PUBLIC ${SOURCE_FILES})