lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-28 23:14:57 +03:00
Code Activity

cmake: Stop using win32config.h

Browse Source 
Move this file to the win32 subdirectory.
This commit is contained in:
Nick Wellnhofer
2024-06-22 02:34:36 +02:00
parent 84a4f84c1c
commit 4b6e68282b
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -587,11 +587,7 @@ install(
COMPONENT development COMPONENT development
) )
if(MSVC) configure_file(config.h.cmake.in config.h)
configure_file(include/win32config.h config.h COPYONLY)
else()
configure_file(config.h.cmake.in config.h)
endif()
configure_file(include/libxml/xmlversion.h.in libxml/xmlversion.h) configure_file(include/libxml/xmlversion.h.in libxml/xmlversion.h)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml/xmlversion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml/xmlversion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)

2
include/Makefile.am
View File

@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS=libxml private SUBDIRS=libxml private
EXTRA_DIST = win32config.h wsockcompat.h meson.build EXTRA_DIST = wsockcompat.h meson.build

2
win32/configure.js
View File

@@ -605,7 +605,7 @@ if (f) {
fso.CopyFile(makefile, new_makefile, true); fso.CopyFile(makefile, new_makefile, true);
WScript.Echo("Created Makefile."); WScript.Echo("Created Makefile.");
// Create the config.h. // Create the config.h.
var confighsrc = "..\\include\\win32config.h"; var confighsrc = "win32config.h";
var configh = "..\\config.h"; var configh = "..\\config.h";
var f = fso.FileExists(configh); var f = fso.FileExists(configh);
if (f) { if (f) {

0
include/win32config.h → win32/win32config.h
View File