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

Jump to bottom

Download Intercept library to vendor folder on build if needed #2

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

Download Intercept library to vendor folder on build if needed #2

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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ CTestTestfile.cmake

# JetBrains
.idea/

# Intercept library
vendor/intercept/
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

19 changes: 17 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6)
cmake_minimum_required (VERSION 3.8)

#----Make changes here

Expand All @@ -9,6 +9,9 @@ project (template-plugin)
#Enabling this results in better performance when handling strings to SQF commands.
option(USE_ENGINE_TYPES "USE_ENGINE_TYPES" OFF)

#Which version of Intercept to build against, branch/commit/tag
set(INTERCEPT_VERSION "dfa2ce681154337a1640ea7fa2d00576fb44349b")

#----Don't change anything below this line

option(USE_64BIT_BUILD "USE_64BIT_BUILD" OFF)
Expand Down Expand Up @@ -38,4 +41,16 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)

set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)

add_subdirectory(src)
add_subdirectory(src)

include(ExternalProject)

# Download Intercept library to vendor folder
ExternalProject_Add(
intercept
PREFIX ${CMAKE_CURRENT_LIST_DIR}/vendor/intercept
URL https://github.com/intercept/intercept/archive/${INTERCEPT_VERSION}.tar.gz
BUILD_COMMAND ""
CONFIGURE_COMMAND ""
INSTALL_COMMAND ""
)
1 change: 0 additions & 1 deletion intercept
Open in desktop
Submodule intercept deleted from f283e2
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ SOURCE_GROUP("src" FILES ${INTERCEPT_PLUGIN_SOURCES})
#----Don't change anything below this line


#include the Intercept headers from the submodule
set(INTERCEPT_CLIENT_PATH "${CMAKE_SOURCE_DIR}/intercept/src/client")
#include the Intercept headers from the vendored library
set(INTERCEPT_CLIENT_PATH "${CMAKE_SOURCE_DIR}/vendor/intercept/src/intercept/src/client")

set(INTERCEPT_INCLUDE_PATH "${INTERCEPT_CLIENT_PATH}/headers" "${INTERCEPT_CLIENT_PATH}/headers/shared" "${INTERCEPT_CLIENT_PATH}/headers/client/" "${INTERCEPT_CLIENT_PATH}/headers/client/sqf")

Expand Down