Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
1c587198
Commit
1c587198
authored
Apr 11, 2014
by
Brad King
💬
Browse files
Merge branch 'rc-windres-with-dot' into release
parents
a2da465b
7147ed5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/CMakeRCInformation.cmake
View file @
1c587198
...
@@ -13,15 +13,16 @@
...
@@ -13,15 +13,16 @@
# License text for the above reference.)
# License text for the above reference.)
# This file sets the basic flags for the
Fortran language in CMake
.
# This file sets the basic flags for the
Windows Resource Compiler
.
# It also loads the available platform file for the system-compiler
# It also loads the available platform file for the system-compiler
# if it exists.
# if it exists.
# make sure we don't use CMAKE_BASE_NAME from somewhere else
# make sure we don't use CMAKE_BASE_NAME from somewhere else
set
(
CMAKE_BASE_NAME
)
set
(
CMAKE_BASE_NAME
)
get_filename_component
(
CMAKE_BASE_NAME
${
CMAKE_RC_COMPILER
}
NAME_WE
)
if
(
CMAKE_RC_COMPILER MATCHES
"windres[^/]*$"
)
if
(
"
${
CMAKE_BASE_NAME
}
"
MATCHES
"windres"
)
set
(
CMAKE_BASE_NAME
"windres"
)
set
(
CMAKE_BASE_NAME
"windres"
)
else
()
get_filename_component
(
CMAKE_BASE_NAME
${
CMAKE_RC_COMPILER
}
NAME_WE
)
endif
()
endif
()
set
(
CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
set
(
CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
${
CMAKE_ROOT
}
/Modules/Platform/
${
CMAKE_SYSTEM_NAME
}
-
${
CMAKE_BASE_NAME
}
.cmake
)
${
CMAKE_ROOT
}
/Modules/Platform/
${
CMAKE_SYSTEM_NAME
}
-
${
CMAKE_BASE_NAME
}
.cmake
)
...
@@ -30,7 +31,7 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
...
@@ -30,7 +31,7 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
set
(
CMAKE_RC_FLAGS
"$ENV{RCFLAGS}
${
CMAKE_RC_FLAGS_INIT
}
"
CACHE STRING
set
(
CMAKE_RC_FLAGS
"$ENV{RCFLAGS}
${
CMAKE_RC_FLAGS_INIT
}
"
CACHE STRING
"Flags for
Fortran c
ompiler."
)
"Flags for
Windows Resource C
ompiler."
)
# These are the only types of flags that should be passed to the rc
# These are the only types of flags that should be passed to the rc
# command, if COMPILE_FLAGS is used on a target this will be used
# command, if COMPILE_FLAGS is used on a target this will be used
...
...
Write
Preview
Supports
Markdown
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