Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
CAMP
campvis-public
Commits
8670997c
Commit
8670997c
authored
Jun 18, 2016
by
Jakob Weiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUFIX: CMake files now support VS 2015
parent
a4b588c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
cmake/FindTBB.cmake
cmake/FindTBB.cmake
+3
-1
cmake/commonconf.cmake
cmake/commonconf.cmake
+6
-0
No files found.
cmake/FindTBB.cmake
View file @
8670997c
...
...
@@ -33,7 +33,9 @@ IF (WIN32)
ELSEIF
(
CAMPVIS_MSVC11
)
SET
(
TbbCompilerDirectory
"vc11"
)
ELSEIF
(
CAMPVIS_MSVC12
)
SET
(
TbbCompilerDirectory
"vc12"
)
SET
(
TbbCompilerDirectory
"vc12"
)
ELSEIF
(
CAMPVIS_MSVC14
)
SET
(
TbbCompilerDirectory
"vc14"
)
ELSE
()
MESSAGE
(
WARNING
"Compiler not supported by makefile, you might be able to fix that..."
)
ENDIF
(
CAMPVIS_MSVC2010
)
...
...
cmake/commonconf.cmake
View file @
8670997c
...
...
@@ -55,6 +55,10 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 Win64" OR ${CMAKE_GENERATOR
SET
(
CAMPVIS_MSVC12 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
"Visual Studio 12 Build (64 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 14 Win64"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 14 2015 Win64"
)
SET
(
CAMPVIS_MSVC14 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
"Visual Studio 12 Build (64 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
MATCHES
"NMake"
)
SET
(
CAMPVIS_NMAKE TRUE
)
...
...
@@ -67,6 +71,8 @@ ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET
(
CAMPVIS_MSVC11 TRUE
)
ELSEIF
(
MSVC12
)
SET
(
CAMPVIS_MSVC12 TRUE
)
ELSEIF
(
MSVC14
)
SET
(
CAMPVIS_MSVC14 TRUE
)
ENDIF
(
MSVC90
)
IF
(
CMAKE_CL_64
)
...
...
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