diff options
| author | Bo Thorsen <bo@askmonty.org> | 2010-07-01 15:50:54 +0200 |
|---|---|---|
| committer | Bo Thorsen <bo@askmonty.org> | 2010-07-01 15:50:54 +0200 |
| commit | 916f7c5680ed7ce8f33baf1bfbfcae78bb275a4c (patch) | |
| tree | e9e85da0c117887e21433431a97a37f94c435d45 | |
| parent | 2caed165b119465458a14bca5226efc40ea850e9 (diff) | |
| download | mariadb-git-916f7c5680ed7ce8f33baf1bfbfcae78bb275a4c.tar.gz | |
Hardcode the build path for the installer temporarily
| -rwxr-xr-x | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a6b52b8fdcc..5cfe5dc8319 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,11 +342,6 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB") SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING) 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 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/win/cmake" ${CMAKE_MODULE_PATH}) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1005d6fe032..9526c944e50 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -170,4 +170,5 @@ TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32) INSTALL(TARGETS mysqlserver DESTINATION Embedded/static 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) |