Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
28a7bb8b
Commit
28a7bb8b
authored
Dec 16, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attempt to fix error in rc call
parent
37b1efb9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
cmake/mysql_version.cmake
cmake/mysql_version.cmake
+3
-4
No files found.
cmake/mysql_version.cmake
View file @
28a7bb8b
...
@@ -186,7 +186,7 @@ FUNCTION(EMBED_VERSION_INFO target)
...
@@ -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)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment