Skip to content

Commit 8b4c448

Browse files
committed
fix: problem with 3rdparty library
1 parent 2f8d515 commit 8b4c448

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

.github/workflows/cmake-single-platform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Configure CMake
3434
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
3535
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
36-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
36+
run: cmake -B ${{github.workspace}}/build -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
3737

3838
- name: Build
3939
# Build your program with the given configuration

3rdparty/CMakeLists.txt

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
22
PROJECT(MLogger3rdparty)
33

4-
ADD_SUBDIRECTORY(googletest EXCLUDE_FROM_ALL)
4+
IF(NOT TARGET gtest)
5+
MESSAGE(STATUS "gtest target not found. Adding subdirectory...")
6+
ADD_SUBDIRECTORY(googletest EXCLUDE_FROM_ALL)
7+
ELSE()
8+
MESSAGE(STATUS "gtest target already exists. Skipping.")
9+
ENDIF()
510

6-
ADD_SUBDIRECTORY(gflags EXCLUDE_FROM_ALL)
11+
IF(NOT TARGET gflags)
12+
MESSAGE(STATUS "gflags target not found. Adding subdirectory...")
13+
ADD_SUBDIRECTORY(gflags EXCLUDE_FROM_ALL)
14+
ELSE()
15+
MESSAGE(STATUS "gflags target already exists. Skipping.")
16+
ENDIF()
717

8-
SET(CMAKE_DISABLE_FIND_PACKAGE_gflags ON)
18+
IF(NOT TARGET glog)
19+
MESSAGE(STATUS "glog target not found. Adding subdirectory...")
20+
SET(CMAKE_DISABLE_FIND_PACKAGE_gflags ON)
21+
SET(WITH_GFLAGS ON CACHE BOOL "Enable gflags support in glog")
22+
SET(WITH_SYSTEM_GFLAGS OFF CACHE BOOL "Do not use system-installed gflags")
23+
ADD_SUBDIRECTORY(glog EXCLUDE_FROM_ALL)
24+
SET(CMAKE_DISABLE_FIND_PACKAGE_gflags OFF)
25+
ELSE()
26+
message(STATUS "glog target already exists. Skipping.")
27+
ENDIF()
928

10-
SET(WITH_GFLAGS ON CACHE BOOL "Enable gflags support in glog")
11-
SET(WITH_SYSTEM_GFLAGS OFF CACHE BOOL "Do not use system-installed gflags")
12-
ADD_SUBDIRECTORY(glog EXCLUDE_FROM_ALL)
13-
14-
SET(CMAKE_DISABLE_FIND_PACKAGE_gflags OFF)

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PROJECT(MLogger VERSION 1.0.0 LANGUAGES CXX)
55

66
SET(CMAKE_CXX_STANDARD 20)
77

8-
OPTION(BUILD_TESTS "Build with tests" ON)
8+
OPTION(BUILD_TESTS "Build with tests" OFF)
99

1010
MESSAGE(INFO "--------------------------------")
1111
MESSAGE(STATUS "Build MLogger: ${AI_WORKFLOW_VERSION}")

0 commit comments

Comments
 (0)