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

Fix expat config for "NMake Makefiles" target in cmake build

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/639
This commit is contained in:
VZ 2017-12-15 15:45:26 +01:00 committed by GitHub
commit 7ea562eb93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/cmake/lib/xml/CMakeLists.txt
View File

@ -9,12 +9,17 @@
include(../../source_groups.cmake) include(../../source_groups.cmake)
if(WIN32)
set(EXPAT_POSTFIX $<$<CONFIG:Debug>:d>)
endif(WIN32)
if(wxUSE_EXPAT STREQUAL "builtin") if(wxUSE_EXPAT STREQUAL "builtin")
ExternalProject_Add(wxexpat ExternalProject_Add(wxexpat
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
SOURCE_DIR ${wxSOURCE_DIR}/src/expat/expat SOURCE_DIR ${wxSOURCE_DIR}/src/expat/expat
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DBUILD_tools=OFF -DBUILD_tools=OFF
-DBUILD_examples=OFF -DBUILD_examples=OFF
-DBUILD_tests=OFF -DBUILD_tests=OFF
@ -25,7 +30,7 @@ if(wxUSE_EXPAT STREQUAL "builtin")
${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/wxlib ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/wxlib
COMMAND COMMAND
${CMAKE_COMMAND} -E rename ${CMAKE_COMMAND} -E rename
<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}expat${CMAKE_STATIC_LIBRARY_SUFFIX} <INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}expat${EXPAT_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
<INSTALL_DIR>/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpat$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX} <INSTALL_DIR>/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpat$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
) )
ExternalProject_Get_Property(wxexpat INSTALL_DIR) ExternalProject_Get_Property(wxexpat INSTALL_DIR)