Skip to content

Commit cfe2b30

Browse files
committed
fix the issue where compiler cannot find glib when instealled at user directory
1 parent d833f41 commit cfe2b30

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ endif()
8888

8989

9090
# Define shared compiler flags for all targets
91-
set(LIBCACHESIM_C_FLAGS
92-
-Wall -Wextra -Werror
93-
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-unused-but-set-variable
94-
-Wpedantic -Wformat=2 -Wformat-security -Wshadow -Wwrite-strings
91+
set(LIBCACHESIM_C_FLAGS
92+
-Wall -Wextra -Werror
93+
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-unused-but-set-variable
94+
-Wpedantic -Wformat=2 -Wformat-security -Wshadow -Wwrite-strings
9595
-Wstrict-prototypes -Wold-style-definition -Wredundant-decls -Wnested-externs -Wmissing-include-dirs
9696
)
9797

98-
set(LIBCACHESIM_CXX_FLAGS
99-
-Wall -Wextra -Werror
100-
-Wno-deprecated-copy -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-unused-but-set-variable
98+
set(LIBCACHESIM_CXX_FLAGS
99+
-Wall -Wextra -Werror
100+
-Wno-deprecated-copy -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-unused-but-set-variable
101101
-Wno-pedantic -Wformat=2 -Wformat-security -Wshadow -Wwrite-strings -Wmissing-include-dirs
102102
)
103103

@@ -119,10 +119,18 @@ list(APPEND dependency_libs ${CMAKE_THREAD_LIBS_INIT})
119119
# Link standard math and dl libraries universally
120120
list(APPEND dependency_libs m dl)
121121

122-
find_package(GLib REQUIRED)
122+
# Find GLib using pkg-config
123+
find_package(PkgConfig REQUIRED)
124+
125+
# Find glib-2.0 using pkg-config
126+
pkg_check_modules(GLib REQUIRED glib-2.0)
127+
128+
# Add GLib library directories to the linker search path
129+
link_directories(${GLib_LIBRARY_DIRS})
130+
123131
# Don't add GLib includes globally - add them to specific targets
124132
# include_directories(${GLib_INCLUDE_DIRS})
125-
list(APPEND dependency_libs ${GLib_LIBRARY})
133+
list(APPEND dependency_libs ${GLib_LIBRARIES})
126134

127135
find_package(argp REQUIRED)
128136
# Don't add argp includes globally
@@ -334,4 +342,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Find${PROJECT_NAME}.cmake
334342
install(EXPORT ${PROJECT_NAME}Targets
335343
FILE ${PROJECT_NAME}Targets.cmake
336344
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
337-
)
345+
)

0 commit comments

Comments
 (0)