diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 03:51:07 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 03:51:07 +0100 |
| commit | 28a7bb8b8c40127f5ac4c63e939106f9aeed3428 (patch) | |
| tree | bb9b81dc8e7f2158ccf4b3cff25a7e5719bffe34 /cmake | |
| parent | 37b1efb9479aa10e20ede635d147d8cb53dc251d (diff) | |
| download | mariadb-git-28a7bb8b8c40127f5ac4c63e939106f9aeed3428.tar.gz | |
attempt to fix error in rc call
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 54824221350..939b53f47c3 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -186,7 +186,7 @@ FUNCTION(EMBED_VERSION_INFO target) GET_FILENAME_COMPONENT(ORIGINALFILENAME ${target_location} NAME) # Directory where we have resouce script and compiled .res file - SET(RES_DIR ${CMAKE_CURRENT_BINARY_DIR}/version_resources) + SET(RES_DIR ${CMAKE_BINARY_DIR}/version_resources) # Create resource script (.rc) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/versioninfo.rc.in @@ -205,9 +205,8 @@ FUNCTION(EMBED_VERSION_INFO target) IF(RUN_RC) # Run resource compiler EXECUTE_PROCESS( - COMMAND ${CMAKE_RC_COMPILER} /nologo /fo ${target}_versioninfo.res - ${target}_versioninfo.rc - WORKING_DIRECTORY ${RES_DIR} + COMMAND ${CMAKE_RC_COMPILER} ${target}_versioninfo.rc + WORKING_DIRECTORY ${RES_DIR} OUTPUT_QUIET ) ENDIF() TARGET_LINK_LIBRARIES(${target} ${RES_DIR}/${target}_versioninfo.res) |