Skip to content

Commit

Permalink
Restore old third-party; move CMake-based formulas in their own folder
Browse files Browse the repository at this point in the history
  • Loading branch information
alessandrogario authored and Smjert committed Aug 25, 2019
1 parent 38f0a2b commit 7fd4d7c
Show file tree
Hide file tree
Showing 174 changed files with 4,984 additions and 1,582 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ build/
# Run Artifacts
*.log
*.orig
*.patch
*.rej

# Vagrant Artifacts
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "third-party-prebuilt"]
path = third-party-prebuilt
url = https://github.com/theopolis/osquery-third-party-prebuilt
10 changes: 0 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ jobs:
options: --privileged

steps:
- checkout: self
submodules: recursive
displayName: "Update submodules"

- script: mkdir $(Build.BinariesDirectory)/build
displayName: "Create build folder"

Expand Down Expand Up @@ -149,10 +145,6 @@ jobs:
displayName: "Install Homebrew and prerequisites"
timeoutInMinutes: 20
- checkout: self
submodules: recursive
displayName: "Update submodules"

- script: mkdir $(Build.BinariesDirectory)/build
displayName: "Create build folder"

Expand Down Expand Up @@ -250,8 +242,6 @@ jobs:
git config --global core.autocrlf false
- checkout: self
submodules: recursive
displayName: "Update submodules"

- powershell: |
mkdir $(Build.BinariesDirectory)\build
Expand Down
4 changes: 0 additions & 4 deletions cmake/globals.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,3 @@ set(PACKAGING_SYSTEM "" CACHE STRING "Packaging system to generate when building
if(DEFINED PLATFORM_WINDOWS)
set(WIX_ROOT_FOLDER_PATH "" CACHE STRING "Root folder of the WIX installation")
endif()

# Prebuilt variables
set(_ep_keywords_definePrebuiltProject "^(URL|SHA256|DEPENDS|PATCHES|CONFIGURE|BUILD|INSTALL|BUILD_IN_SOURCE)$")
set(REPLACE_CMD "${CMAKE_SOURCE_DIR}/tools/replace.py")
7 changes: 1 addition & 6 deletions cmake/options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,9 @@ option(BUILD_TESTING "Whether to enable and build tests or not")
# This is the default S3 storage used by Facebook to store 3rd party dependencies; it
# is provided here as a configuration option
if("${THIRD_PARTY_REPOSITORY_URL}" STREQUAL "")
set(THIRD_PARTY_REPOSITORY_URL "https://s3.amazonaws.com/osquery-packages" CACHE STRING "")
set(THIRD_PARTY_REPOSITORY_URL "https://s3.amazonaws.com/osquery-packages")
endif()

detectOsqueryVersion()

message(STATUS "osquery version: ${OSQUERY_VERSION_INTERNAL}")

if("${THIRD_PARTY_PREBUILT_PATH}" STREQUAL "")
set(THIRD_PARTY_PREBUILT_PATH "${CMAKE_SOURCE_DIR}/third-party-prebuilt" CACHE STRING "Path to prebuilt platform prefixes")
endif()

5 changes: 5 additions & 0 deletions osquery/tables/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ function(generateOsqueryTablesTableimplementations)
target_link_libraries(osquery_tables_tableimplementations INTERFACE
osquery_tables_smart
)

elseif(DEFINED PLATFORM_WINDOWS)
target_link_libraries(osquery_tables_tableimplementations INTERFACE
osquery_tables_cloud
)
endif()

if(DEFINED PLATFORM_LINUX)
Expand Down
Loading

0 comments on commit 7fd4d7c

Please sign in to comment.