Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AG Computergrafik
ss21cg3
Commits
7954f5ae
Commit
7954f5ae
authored
Apr 26, 2021
by
Bastian Krayer
Browse files
updated cmake
parent
e257839a
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cmake/FindASSIMP.cmake
View file @
7954f5ae
...
...
@@ -151,7 +151,7 @@ set(ASSIMP_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIR})
if
(
ASSIMP_FOUND AND NOT TARGET Assimp::Assimp
)
add_library
(
Assimp::Assimp INTERFACE IMPORTED
)
IF
(
NOT ASSIMP_INTERFACE_LIBRARY
)
SET
(
ASSIMP_INTERFACE_LIBRARY
${
ASSIMP_LIBRAR
IES
}
)
SET
(
ASSIMP_INTERFACE_LIBRARY
${
ASSIMP_LIBRAR
Y
}
)
ENDIF
()
set_target_properties
(
Assimp::Assimp PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"
${
ASSIMP_INCLUDE_DIR
}
"
...
...
src/cmake/FindGLFW3.cmake
View file @
7954f5ae
...
...
@@ -139,7 +139,7 @@ if(GLFW3_FOUND AND NOT TARGET GLFW3::glfw3)
add_library
(
GLFW3::glfw3 INTERFACE IMPORTED
)
IF
(
NOT GLFW3_INTERFACE_LIBRARY
)
SET
(
GLFW3_INTERFACE_LIBRARY
${
GLFW3_LIBRAR
IES
}
)
SET
(
GLFW3_INTERFACE_LIBRARY
${
GLFW3_LIBRAR
Y
}
)
ENDIF
()
set_target_properties
(
GLFW3::glfw3 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"
${
GLFW3_INCLUDE_DIR
}
"
...
...
src/cmake/projectTools.cmake
View file @
7954f5ae
...
...
@@ -70,6 +70,7 @@ MACRO(CreateExecutable executableName)
target_compile_options
(
${
executableName
}
PUBLIC
"$<$<CONFIG:Debug>:/bigobj>"
)
elseif
(
APPLE
)
# -Wa,-mbig-obj does not exist in clang but supposedly it just works on Mac anyways
else
()
target_compile_options
(
${
executableName
}
PUBLIC
"$<$<CONFIG:Debug>:-Wa,-mbig-obj>"
...
...
@@ -129,6 +130,7 @@ MACRO(CreateLibrary libraryName IS_INTERFACE)
target_compile_options
(
${
libraryName
}
PUBLIC
"$<$<CONFIG:Debug>:/bigobj>"
)
elseif
(
APPLE
)
# -Wa,-mbig-obj does not exist in clang but supposedly it just works on Mac anyways
else
()
target_compile_options
(
${
libraryName
}
PUBLIC
"$<$<CONFIG:Debug>:-Wa,-mbig-obj>"
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment