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
André Pedro
CMake
Commits
5ed4e481
Commit
5ed4e481
authored
8 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
InstallRequiredSystemLibraries: Split MFC redist dir variable
parent
dbdb880a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/InstallRequiredSystemLibraries.cmake
+5
-3
5 additions, 3 deletions
Modules/InstallRequiredSystemLibraries.cmake
with
5 additions
and
3 deletions
Modules/InstallRequiredSystemLibraries.cmake
+
5
−
3
View file @
5ed4e481
...
...
@@ -383,13 +383,15 @@ if(MSVC)
set
(
v
"
${
_MFC_DLL_VERSION
}
"
)
set
(
vs
"
${
_MFC_IDE_VERSION
}
"
)
set
(
MSVC_REDIST_MFC_DIR
"
${
MSVC_REDIST_DIR
}
"
)
# Multi-Byte Character Set versions of MFC are available as optional
# addon since Visual Studio 12. So for version 12 or higher, check
# whether they are available and exclude them if they are not.
if
(
CMAKE_INSTALL_DEBUG_LIBRARIES
)
set
(
MSVC_MFC_DIR
"
${
MSVC_REDIST_DIR
}
/Debug_NonRedist/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.DebugMFC"
)
"
${
MSVC_REDIST_
MFC_
DIR
}
/Debug_NonRedist/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.DebugMFC"
)
set
(
__install__libs
${
__install__libs
}
"
${
MSVC_MFC_DIR
}
/mfc
${
v
}
ud.dll"
"
${
MSVC_MFC_DIR
}
/mfcm
${
v
}
ud.dll"
...
...
@@ -402,7 +404,7 @@ if(MSVC)
endif
()
endif
()
set
(
MSVC_MFC_DIR
"
${
MSVC_REDIST_DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.MFC"
)
set
(
MSVC_MFC_DIR
"
${
MSVC_REDIST_
MFC_
DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.MFC"
)
if
(
NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY
)
set
(
__install__libs
${
__install__libs
}
"
${
MSVC_MFC_DIR
}
/mfc
${
v
}
u.dll"
...
...
@@ -417,7 +419,7 @@ if(MSVC)
endif
()
# include the language dll's as well as the actuall dll's
set
(
MSVC_MFCLOC_DIR
"
${
MSVC_REDIST_DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.MFCLOC"
)
set
(
MSVC_MFCLOC_DIR
"
${
MSVC_REDIST_
MFC_
DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC
${
vs
}
0.MFCLOC"
)
set
(
__install__libs
${
__install__libs
}
"
${
MSVC_MFCLOC_DIR
}
/mfc
${
v
}
chs.dll"
"
${
MSVC_MFCLOC_DIR
}
/mfc
${
v
}
cht.dll"
...
...
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