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.

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

BuildTransitive targets and BinSkim issues #7

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+10 −9
Open

BuildTransitive targets and BinSkim issues #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20e253b
Add targets to buildTransitive folder in the nuget package
Feb 7, 2023
55631b8
Add /guard:cf and /DYNAMICBASE when building with VC++
Feb 7, 2023
2b1a7dc
Fix incorrect CXX flags extension
Feb 7, 2023
ffba4b7
Correct Cmake linker flags variable
Feb 7, 2023
2209b18
Merge branch 'perforce:master' into master
TheFieryScythe Oct 22, 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
3 changes: 1 addition & 2 deletions p4api.net/p4api.net.core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
<file src="..\LICENSE.txt" target="" />
<file src="p4api.net.core.targets" target="build" />
<file src="p4api.net.core.targets" target="buildTransitive" />
</files>
</package>


3 changes: 1 addition & 2 deletions p4api.net/p4api.net.lib.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
<file src="..\LICENSE.txt" target="" />
<file src="p4api.net.targets" target="build" />
<file src="p4api.net.targets" target="buildTransitive" />
</files>
</package>


3 changes: 1 addition & 2 deletions p4api.net/p4api.net.x64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
<file src="..\LICENSE.txt" target="" />
<file src="p4api.net.x64.targets" target="build" />
<file src="p4api.net.x64.targets" target="buildTransitive" />
</files>
</package>


3 changes: 1 addition & 2 deletions p4api.net/p4api.net.x86.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
<file src="..\LICENSE.txt" target="" />
<file src="p4api.net.x86.targets" target="build" />
<file src="p4api.net.x86.targets" target="buildTransitive" />
</files>
</package>


7 changes: 6 additions & 1 deletion p4bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
string(COMPARE EQUAL "${MSVC_CXX_ARCHITECTURE_ID}" "X86" _is_x86)
link_directories( "../p4api$<${_is_x86}:_x86>_$<IF:$<CONFIG:Debug>,debug,release>/lib" )
include_directories( "../p4api$<${_is_x86}:_x86>_$<IF:$<CONFIG:Debug>,debug,release>/include/p4" )
if (MSVC AND (MSVC_VERSION GREATER 1900))
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /guard:cf /DYNAMICBASE")
endif()
endif()

if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
Expand All @@ -44,7 +49,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
find_library(Foundation_lib Foundation )
find_library(CoreServices_lib CoreServices )
find_library(CoreGraphics_lib CoreGraphics )
find_library(Security_lib Security )
find_library(Security_lib Security )
set(PlatformLibs ${Foundation_lib} ${CoreServices_lib} ${CoreGraphics_lib} ${Security_lib})
link_directories( "../p4api/lib" )
include_directories("../p4api/include/p4")
Expand Down