Install pkg-config on all platforms; MinGW doesn't need win32/ helpers

apertium · Aug 23, 2024 · 47e4bf9 · 47e4bf9
1 parent 5bc7fc5
commit 47e4bf9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,16 +79,16 @@ else()
 	if(NOT _ENABLED_CXX)
 		message(FATAL_ERROR "Could not enable at least C++17 - upgrade your compiler")
 	endif()
-
-	# Generate pkg-config file
-	set(prefix      ${CMAKE_INSTALL_PREFIX})
-	set(exec_prefix "\${prefix}")
-	set(libdir      "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-	set(includedir  "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-	configure_file(lttoolbox.pc.in lttoolbox.pc @ONLY)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lttoolbox.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
 endif()
 
+# Generate pkg-config file
+set(prefix      ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}")
+set(libdir      "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+set(includedir  "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+configure_file(lttoolbox.pc.in lttoolbox.pc @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lttoolbox.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+
 try_compile(SIZET_NOT_CSTDINT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/lttoolbox/check-cstdint.cc)
 if(SIZET_NOT_CSTDINT)
 	add_definitions(-DSIZET_NOT_CSTDINT)

diff --git a/lttoolbox/CMakeLists.txt b/lttoolbox/CMakeLists.txt
@@ -65,7 +65,7 @@ set(LIBLTTOOLBOX_SOURCES
 	xml_walk_util.cc
 	${LIBLTTOOLBOX_HEADERS}
 	)
-if(WIN32)
+if(MSVC)
 	set(LIBLTTOOLBOX_SOURCES
 		win32/libgen.c
 		win32/libgen.h