Skip to content

Commit 41a240a

Browse files
committed
Make pkg_config support opt-in when building with Microsoft Visual Studio
1 parent b2f7aac commit 41a240a

File tree

1 file changed

+26
-20
lines changed

1 file changed

+26
-20
lines changed

CMakeLists.txt

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -173,33 +173,39 @@ IF(MSVC AND BUILD_SHARED_LIBS AND LOG4CXX_INSTALL_PDB)
173173
)
174174
ENDIF()
175175

176-
# Support for pkg-config in consuming projects
177-
set(prefix "${CMAKE_INSTALL_PREFIX}")
178-
set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
179-
set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
180-
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
181-
set(VERSION "${log4cxx_VERSION_MAJOR}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH}")
182-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/liblog4cxx.pc.in"
183-
"${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}.pc"
184-
)
185-
186-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}.pc"
187-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
188-
189-
if(LOG4CXX_QT_SUPPORT)
176+
set(install_pkg_config ON)
177+
if(MSVC)
178+
set(install_pkg_config OFF)
179+
endif(MSVC)
180+
option(LOG4CXX_WITH_PKG_CONFIG "Support pkg_config in consuming projects" ${install_pkg_config})
181+
if(LOG4CXX_WITH_PKG_CONFIG)
190182
set(prefix "${CMAKE_INSTALL_PREFIX}")
191183
set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
192184
set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
193185
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
194186
set(VERSION "${log4cxx_VERSION_MAJOR}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH}")
195-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/liblog4cxx-qt.pc.in"
196-
"${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}-qt.pc"
187+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/liblog4cxx.pc.in"
188+
"${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}.pc"
197189
)
198190

199-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}-qt.pc"
200-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
201-
)
202-
endif(LOG4CXX_QT_SUPPORT)
191+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}.pc"
192+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
193+
194+
if(LOG4CXX_QT_SUPPORT)
195+
set(prefix "${CMAKE_INSTALL_PREFIX}")
196+
set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
197+
set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
198+
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
199+
set(VERSION "${log4cxx_VERSION_MAJOR}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH}")
200+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/liblog4cxx-qt.pc.in"
201+
"${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}-qt.pc"
202+
)
203+
204+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LOG4CXX_LIB_NAME}-qt.pc"
205+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
206+
)
207+
endif(LOG4CXX_QT_SUPPORT)
208+
endif(LOG4CXX_WITH_PKG_CONFIG)
203209

204210
# Support for find_package(log4cxx) in consuming CMake projects using
205211
# target_include_directories(myApplication PRIVATE $<TARGET_PROPERTY:log4cxx,INTERFACE_INCLUDE_DIRECTORIES>)

0 commit comments

Comments
 (0)