Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Cleanup the wx_configure_script macro

Browse Source
This commit is contained in:
Maarten Bent
2021-10-27 22:28:06 +02:00
parent f59bbcd3e1
commit ad75a77bc6
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/cmake/config.cmake
View File

@@ -12,11 +12,8 @@ file(MAKE_DIRECTORY ${wxCONFIG_DIR})
set(TOOLCHAIN_FULLNAME ${wxBUILD_FILE_ID}) set(TOOLCHAIN_FULLNAME ${wxBUILD_FILE_ID})
macro(wx_configure_script input output) macro(wx_configure_script input output)
set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
set(abs_top_builddir ${CMAKE_CURRENT_BINARY_DIR})
configure_file( configure_file(
${input} ${CMAKE_CURRENT_SOURCE_DIR}/${input}
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${output} ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${output}
ESCAPE_QUOTES @ONLY NEWLINE_STYLE UNIX) ESCAPE_QUOTES @ONLY NEWLINE_STYLE UNIX)
file(COPY file(COPY
@@ -68,7 +65,7 @@ endmacro()
function(wx_write_config_inplace) function(wx_write_config_inplace)
wx_configure_script( wx_configure_script(
"${CMAKE_CURRENT_SOURCE_DIR}/wx-config-inplace.in" "wx-config-inplace.in"
"inplace-${TOOLCHAIN_FULLNAME}" "inplace-${TOOLCHAIN_FULLNAME}"
) )
if(WIN32_MSVC_NAMING) if(WIN32_MSVC_NAMING)
@@ -191,7 +188,7 @@ function(wx_write_config)
set(RESCOMP) set(RESCOMP)
wx_configure_script( wx_configure_script(
"${CMAKE_CURRENT_SOURCE_DIR}/wx-config.in" "wx-config.in"
"${TOOLCHAIN_FULLNAME}" "${TOOLCHAIN_FULLNAME}"
) )
endfunction() endfunction()