Commit 916f7c56 authored by Bo Thorsen's avatar Bo Thorsen

Hardcode the build path for the installer temporarily

parent 2caed165
...@@ -342,11 +342,6 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB") ...@@ -342,11 +342,6 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB")
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING) SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
SET(CPACK_GENERATOR NSIS) SET(CPACK_GENERATOR NSIS)
# This will set the build type for CPack
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
ENDIF()
# Use our own NSIS template # Use our own NSIS template
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/win/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/win/cmake" ${CMAKE_MODULE_PATH})
......
...@@ -170,4 +170,5 @@ TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32) ...@@ -170,4 +170,5 @@ TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32)
INSTALL(TARGETS mysqlserver DESTINATION Embedded/static COMPONENT embedded) INSTALL(TARGETS mysqlserver DESTINATION Embedded/static COMPONENT embedded)
INSTALL(TARGETS libmysqld DESTINATION Embedded/DLL COMPONENT embedded) INSTALL(TARGETS libmysqld DESTINATION Embedded/DLL COMPONENT embedded)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/libmysqld.exp DESTINATION Embedded/DLL COMPONENT embedded)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/libmysqld.exp DESTINATION Embedded/DLL COMPONENT embedded)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment