Fix for CONC-222: Fix installation of include files (bug was introduc…

…ed by commit d0a0e4c)
mariadb-corporation · Jan 2, 2017 · cb8d9d8 · cb8d9d8
1 parent 2261808
commit cb8d9d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -8,15 +8,18 @@ SET(MARIADB_CLIENT_INCLUDES ${CC_SOURCE_DIR}/include/mariadb_com.h
                             ${CC_SOURCE_DIR}/include/errmsg.h
                             ${CC_SOURCE_DIR}/include/mariadb_dyncol.h
                             ${CC_SOURCE_DIR}/include/mariadb_ctype.h
-                            PARENT_SCOPE)
+                            )
 SET(MYSQL_ADDITIONAL_INCLUDES
    ${CC_SOURCE_DIR}/include/mysql/client_plugin.h
    ${CC_SOURCE_DIR}/include/mysql/plugin_auth_common.h
    ${CC_SOURCE_DIR}/include/mysql/plugin_auth.h
-   PARENT_SCOPE)
- SET(MARIADB_ADDITIONAL_INCLUDES
+   )
+SET(MARIADB_ADDITIONAL_INCLUDES
    ${CC_SOURCE_DIR}/include/mariadb/ma_io.h
-   PARENT_SCOPE)
+   )
+IF(WIN32)
+  SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
+ENDIF()
 
 INSTALL(FILES
    ${MARIADB_CLIENT_INCLUDES}

diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
@@ -39,8 +39,7 @@ FOREACH(plugin ${PLUGINS})
   ENDIF()
 ENDFOREACH()
 
-SET(ALL_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES})
-FOREACH(src ${ALL_INCLUDES})
+FOREACH(src ${WIX_INCLUDES})
   STRING(REPLACE "${CC_SOURCE_DIR}/include/" "" src ${src})
   # check binary dir
   STRING(REPLACE "${CC_BINARY_DIR}/include/" "" chgbin ${src})