Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Golden
CMake
Commits
37d15c39
Commit
37d15c39
authored
8 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
MSVC: Set all CMAKE_*_LINKER_FLAGS_INIT directly
Avoid copying CMAKE_EXE_LINKER_FLAGS_INIT to the others.
parent
55c884ed
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/Platform/Windows-MSVC.cmake
+19
-28
19 additions, 28 deletions
Modules/Platform/Windows-MSVC.cmake
with
19 additions
and
28 deletions
Modules/Platform/Windows-MSVC.cmake
+
19
−
28
View file @
37d15c39
...
...
@@ -166,7 +166,9 @@ if(WINCE)
endforeach
()
set
(
CMAKE_C_STANDARD_LIBRARIES_INIT
"coredll.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib"
)
set
(
CMAKE_EXE_LINKER_FLAGS_INIT
"
${
CMAKE_EXE_LINKER_FLAGS_INIT
}
/NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib"
)
foreach
(
t EXE SHARED MODULE
)
string
(
APPEND CMAKE_
${
t
}
_LINKER_FLAGS_INIT
" /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib"
)
endforeach
()
if
(
MSVC_VERSION LESS 1600
)
set
(
CMAKE_C_STANDARD_LIBRARIES_INIT
"
${
CMAKE_C_STANDARD_LIBRARIES_INIT
}
corelibc.lib"
)
...
...
@@ -235,9 +237,6 @@ elseif(MSVC_CXX_ARCHITECTURE_ID)
elseif
(
MSVC_Fortran_ARCHITECTURE_ID
)
set
(
_MACHINE_ARCH_FLAG
"/machine:
${
MSVC_Fortran_ARCHITECTURE_ID
}
"
)
endif
()
set
(
CMAKE_EXE_LINKER_FLAGS_INIT
"
${
CMAKE_EXE_LINKER_FLAGS_INIT
}
${
_MACHINE_ARCH_FLAG
}
"
)
set
(
CMAKE_STATIC_LINKER_FLAGS_INIT
"
${
CMAKE_STATIC_LINKER_FLAGS_INIT
}
${
_MACHINE_ARCH_FLAG
}
"
)
unset
(
_MACHINE_ARCH_FLAG
)
# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype
# on versions that support it
...
...
@@ -250,30 +249,22 @@ if(NOT WINDOWS_PHONE AND NOT WINDOWS_STORE)
endif
()
endif
()
if
(
CMAKE_COMPILER_SUPPORTS_PDBTYPE
)
set
(
CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT
"/debug /pdbtype:sept
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT
"/debug /pdbtype:sept
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
else
()
set
(
CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT
"/debug
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT
"/debug
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
endif
()
# for release and minsize release default to no incremental linking
set
(
CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT
"/INCREMENTAL:NO"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT
"/INCREMENTAL:NO"
)
# copy the EXE_LINKER flags to SHARED and MODULE linker flags
# shared linker flags
set
(
CMAKE_SHARED_LINKER_FLAGS_INIT
${
CMAKE_EXE_LINKER_FLAGS_INIT
}
)
set
(
CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT
${
CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT
}
)
set
(
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT
${
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT
}
)
set
(
CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT
${
CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT
}
)
set
(
CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT
${
CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT
}
)
# module linker flags
set
(
CMAKE_MODULE_LINKER_FLAGS_INIT
${
CMAKE_SHARED_LINKER_FLAGS_INIT
}
)
set
(
CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT
${
CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT
}
)
set
(
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT
${
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT
}
)
set
(
CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT
${
CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT
}
)
set
(
CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT
${
CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT
}
)
foreach
(
t EXE SHARED MODULE
)
string
(
APPEND CMAKE_
${
t
}
_LINKER_FLAGS_INIT
"
${
_MACHINE_ARCH_FLAG
}
"
)
if
(
CMAKE_COMPILER_SUPPORTS_PDBTYPE
)
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_DEBUG_INIT
"/debug /pdbtype:sept
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_RELWITHDEBINFO_INIT
"/debug /pdbtype:sept
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
else
()
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_DEBUG_INIT
"/debug
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_RELWITHDEBINFO_INIT
"/debug
${
MSVC_INCREMENTAL_YES_FLAG
}
"
)
endif
()
# for release and minsize release default to no incremental linking
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_MINSIZEREL_INIT
"/INCREMENTAL:NO"
)
set
(
CMAKE_
${
t
}
_LINKER_FLAGS_RELEASE_INIT
"/INCREMENTAL:NO"
)
endforeach
()
string
(
APPEND CMAKE_STATIC_LINKER_FLAGS_INIT
"
${
_MACHINE_ARCH_FLAG
}
"
)
unset
(
_MACHINE_ARCH_FLAG
)
macro
(
__windows_compiler_msvc lang
)
if
(
NOT MSVC_VERSION LESS 1400
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment