From 8cf2b683be2c2878c2406d463f526524c5856b53 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 6 Dec 2018 22:27:25 +0100 Subject: [PATCH] CMake: Fix installation include directory --- build/cmake/install.cmake | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index 734a2af88a..5e30a933f2 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -12,13 +12,19 @@ if(NOT wxBUILD_INSTALL) endif() install(CODE "message(STATUS \"Installing: Headers...\")") -wx_install( - DIRECTORY "${wxSOURCE_DIR}/include/wx" - DESTINATION "include") -if(MSVC) +if(UNIX) wx_install( - DIRECTORY "${wxSOURCE_DIR}/include/msvc" + DIRECTORY "${wxSOURCE_DIR}/include/wx" + DESTINATION "include/wx-${wxMAJOR_VERSION}.${wxMINOR_VERSION}") +else() + wx_install( + DIRECTORY "${wxSOURCE_DIR}/include/wx" DESTINATION "include") + if(MSVC) + wx_install( + DIRECTORY "${wxSOURCE_DIR}/include/msvc" + DESTINATION "include") + endif() endif() # setup header and wx-config