Skip to content

Commit 59b011f

Browse files
committed
Upgrade build to latest garrysmod_common version
1 parent 3dbd33b commit 59b011f

File tree

5 files changed

+24
-27
lines changed

5 files changed

+24
-27
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- '**.c'
1212
- '**.cmake'
1313
- '**.txt'
14+
- '**.json'
1415
- '.github/workflows/build.yml'
1516
workflow_dispatch:
1617

@@ -41,6 +42,8 @@ jobs:
4142
runs-on: ${{ matrix.os }}
4243

4344
steps:
45+
- uses: lukka/get-cmake@latest
46+
4447
- uses: actions/checkout@v4
4548
with:
4649
submodules: 'recursive'

CMakeLists.txt

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
cmake_minimum_required(VERSION 3.22)
22
enable_language(CXX C)
33

4-
# Require C++ 17
5-
set(CMAKE_CXX_STANDARD 17)
6-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7-
8-
# Enable -fPIC flag
9-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
10-
114
# Enable IDE folders
125
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
136

@@ -21,15 +14,18 @@ if(APPLE)
2114
)
2215
endif()
2316

24-
# Include extensions
25-
add_subdirectory(cmake)
17+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2618

27-
# Include garrysmod_common
28-
find_garrysmod_common()
29-
if(NOT GARRYSMOD_COMMON_FOUND) # Check if garrysmod_common has been found
30-
message(FATAL_ERROR "garrysmod_common not found")
31-
endif()
19+
project(gm_asyncio VERSION 1.0.1 LANGUAGES CXX)
20+
21+
# Enable -fPIC flag
22+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
23+
24+
# Require C++ 17
25+
set(CMAKE_CXX_STANDARD 17)
26+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
27+
set(CMAKE_CXX_EXTENSIONS OFF)
3228

33-
project(gm_asyncio VERSION 1.0.0 LANGUAGES CXX)
29+
find_package(GarrysmodCommon REQUIRED)
3430

3531
add_subdirectory(source)

cmake/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

cmake/FindGarrysmodCommon.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
message(STATUS "Looking for garrysmod_common...")
2+
set(GARRYSMOD_COMMON_PATH "GARRYSMOD_COMMON_NOT_FOUND" CACHE PATH "Path to garrysmod_common (https://github.com/dankmolot/garrysmod_common/tree/master-cmake)")
3+
cmake_path(ABSOLUTE_PATH GARRYSMOD_COMMON_PATH NORMALIZE)
4+
5+
if(NOT IS_DIRECTORY ${GARRYSMOD_COMMON_PATH} OR NOT EXISTS ${GARRYSMOD_COMMON_PATH}/CMakeLists.txt OR ${GARRYSMOD_COMMON_PATH} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
6+
message(FATAL_ERROR "Invalid path to garrysmod_common. Please set valid GARRYSMOD_COMMON_PATH")
7+
endif()
8+
9+
add_subdirectory(${GARRYSMOD_COMMON_PATH} ${CMAKE_BINARY_DIR}/garrysmod_common)
10+
set(GarrysmodCommon_FOUND TRUE)

cmake/find_garrysmod_common.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)