database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

attempt to fix error in rc call

Browse Source
This commit is contained in:
Vladislav Vaintroub
2009-12-16 03:51:07 +01:00
parent 833be37d95
commit ffb0926373
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/mysql_version.cmake
View File

@ -186,7 +186,7 @@ FUNCTION(EMBED_VERSION_INFO target)
GET_FILENAME_COMPONENT(ORIGINALFILENAME ${target_location} NAME) GET_FILENAME_COMPONENT(ORIGINALFILENAME ${target_location} NAME)
# Directory where we have resouce script and compiled .res file # 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) # Create resource script (.rc)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/versioninfo.rc.in CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/versioninfo.rc.in
@ -205,9 +205,8 @@ FUNCTION(EMBED_VERSION_INFO target)
IF(RUN_RC) IF(RUN_RC)
# Run resource compiler # Run resource compiler
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${CMAKE_RC_COMPILER} /nologo /fo ${target}_versioninfo.res COMMAND ${CMAKE_RC_COMPILER} ${target}_versioninfo.rc
${target}_versioninfo.rc WORKING_DIRECTORY ${RES_DIR} OUTPUT_QUIET
WORKING_DIRECTORY ${RES_DIR}
) )
ENDIF() ENDIF()
TARGET_LINK_LIBRARIES(${target} ${RES_DIR}/${target}_versioninfo.res) TARGET_LINK_LIBRARIES(${target} ${RES_DIR}/${target}_versioninfo.res)