Skip to content

Make cmake configurable #12

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.

Sign up for GitHub

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

Open
HO-COOH wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make cmake configurable #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_COLOR_MAKEFILE ON)

# top level cmake file for P4API.NET
project(P4ApiNet DESCRIPTION "p4api.net project" LANGUAGES CSharp CPP)

project(P4ApiNet DESCRIPTION "p4api.net project")
message( NOTICE "Platform: ${CMAKE_SYSTEM_NAME}" ) # 'Windows' 'Linux' 'Darwin'
message( NOTICE "Version: ${P4ApiNet_VERSION}" )
message( NOTICE "Build Type: ${CMAKE_BUILD_TYPE}" )
Expand All @@ -17,16 +16,29 @@ endif()

add_subdirectory(p4bridge)
add_subdirectory(p4bridge-unit-test)
add_subdirectory(p4bridgeStressTest)

set(add_bridge_test ON)
if (EXISTS p4bridgeStressTest/CMakeLists.txt)
add_subdirectory(p4bridgeStressTest)
else()
set(add_bridge_test OFF)
endif()
add_subdirectory(p4api.net)
add_subdirectory(p4api.net-unit-test)

add_custom_target(bridgetests)
add_dependencies(bridgetests p4bridge-unit-test p4bridgeStressTest)
if (EXISTS p4api.net-unit-test/CMakeLists.txt)
add_subdirectory(p4api.net-unit-test)
add_custom_target(tests)
add_dependencies(tests p4api.net-unit-test)
else()
set(add_bridge_test OFF)
endif()

if (add_bridge_test)
add_custom_target(bridgetests)
add_dependencies(bridgetests p4bridge-unit-test p4bridgeStressTest)
endif()

add_custom_target(tests)
add_dependencies(tests p4api.net-unit-test)
set(P4APINET_SOURCES )
# set(P4APINET_SOURCES )

add_executable(P4ApiNet ${P4APINET_SOURCES})
# add_executable(P4ApiNet ${P4APINET_SOURCES})

4 changes: 0 additions & 4 deletions p4api.net/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ if (WIN32)
set(CMAKE_SHARED_LIBRARY_PREFIX "")
endif()

# Setup project to use C# utilities
INCLUDE(CSharpUtils)


ADD_LIBRARY(P4ApiNetLib SHARED
BranchSpec.cs
BridgeInterfaceClasses.cs
Expand Down
4 changes: 3 additions & 1 deletion p4bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ if (hasParent)
endif()

# declare our DLL target
add_library(p4bridge SHARED ${HEADER_FILES} ${SRC_FILES} p4bridge.rc)
if (NOT TARGET p4bridge)
add_library(p4bridge SHARED ${HEADER_FILES} ${SRC_FILES} p4bridge.rc)
endif()

set_source_files_properties(p4bridge.def PROPERTIES HEADER_FILE_ONLY TRUE )

Expand Down