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
e206d580
Commit
e206d580
authored
18 years ago
by
Ken Martin
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix for CXX only projects
parent
42819b7a
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/Platform/Windows-cl.cmake
+7
-3
7 additions, 3 deletions
Modules/Platform/Windows-cl.cmake
with
7 additions
and
3 deletions
Modules/Platform/Windows-cl.cmake
+
7
−
3
View file @
e206d580
...
...
@@ -86,7 +86,11 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles")
"
${
CMAKE_ROOT
}
/Modules/CMakeTestNMakeCLVersion.c"
)
STRING
(
REGEX REPLACE
"/"
"
\\\\
"
testNmakeCLVersionFile
"
${
testNmakeCLVersionFile
}
"
)
MESSAGE
(
STATUS
"Check for CL compiler version"
)
EXEC_PROGRAM
(
${
CMAKE_C_COMPILER
}
SET
(
CMAKE_TEST_COMPILER
${
CMAKE_C_COMPILER
}
)
IF
(
NOT CMAKE_C_COMPILER
)
SET
(
CMAKE_TEST_COMPILER
${
CMAKE_CXX_COMPILER
}
)
ENDIF
(
NOT CMAKE_C_COMPILER
)
EXEC_PROGRAM
(
${
CMAKE_TEST_COMPILER
}
ARGS /nologo -EP \"
${
testNmakeCLVersionFile
}
\"
OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
RETURN_VALUE CMAKE_COMPILER_RETURN
...
...
@@ -139,7 +143,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles")
"
${
CMAKE_ROOT
}
/Modules/CMakeTestForFreeVC.cxx"
)
STRING
(
REGEX REPLACE
"/"
"
\\\\
"
testForFreeVCFile
"
${
testForFreeVCFile
}
"
)
MESSAGE
(
STATUS
"Check if this is a free VC compiler"
)
EXEC_PROGRAM
(
${
CMAKE_
C
_COMPILER
}
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/CMakeTmp2
EXEC_PROGRAM
(
${
CMAKE_
TEST
_COMPILER
}
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/CMakeTmp2
ARGS /nologo /MD /EHsc
\"
${
testForFreeVCFile
}
\"
OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
...
...
@@ -160,7 +164,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles")
ENDIF
(
CMAKE_COMPILER_RETURN
)
MAKE_DIRECTORY
(
"
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/CMakeTmp3"
)
MESSAGE
(
STATUS
"Check CL platform"
)
EXEC_PROGRAM
(
${
CMAKE_
C
_COMPILER
}
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/CMakeTmp3
EXEC_PROGRAM
(
${
CMAKE_
TEST
_COMPILER
}
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/CMakeTmp3
ARGS /nologo
\"
${
testForFreeVCFile
}
\"
/link /machine:i386
...
...
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