diff options
| author | Bo Thorsen <bo@askmonty.org> | 2010-07-01 12:12:48 +0200 |
|---|---|---|
| committer | Bo Thorsen <bo@askmonty.org> | 2010-07-01 12:12:48 +0200 |
| commit | 2caed165b119465458a14bca5226efc40ea850e9 (patch) | |
| tree | 8bdbb64408a27d6ab3a455370670868744dd36b8 | |
| parent | ccdbcaeb57d203cc7b16965f0216e3e96a850e56 (diff) | |
| download | mariadb-git-2caed165b119465458a14bca5226efc40ea850e9.tar.gz | |
Fix cpack run
| -rwxr-xr-x | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cfe5dc8319..a6b52b8fdcc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,6 +342,11 @@ 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 495a8375af8..1005d6fe032 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -170,4 +170,4 @@ 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}/Release/libmysqld.exp DESTINATION Embedded/DLL COMPONENT embedded) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/libmysqld.exp DESTINATION Embedded/DLL COMPONENT embedded) |