Fixing a boatload of warnings

This commit is contained in:
Stefan Högler
2021-04-01 16:40:14 +02:00
parent f042480540
commit d5f0fe644f
84 changed files with 496 additions and 407 deletions
+4 -3
View File
@@ -48,12 +48,13 @@ else()
/usr/local/include
/sw/include
/opt/local/include
${ASSIMP_ROOT}/include
DOC "The directory where assimp/scene.h resides")
# Find library files
find_library(
ASSIMP_LIBRARY
NAMES assimp
NAMES libassimp${CMAKE_DEBUG_POSTFIX}.so
PATHS
/usr/lib64
/usr/lib
@@ -61,12 +62,12 @@ else()
/usr/local/lib
/sw/lib
/opt/local/lib
${ASSIMP_ROOT}/lib
${ASSIMP_ROOT}/bin
DOC "The Assimp library")
endif()
# Handle REQUIRD argument, define *_FOUND variable
find_package_handle_standard_args(assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_LIBRARY ASSIMP_BINARY)
find_package_handle_standard_args(assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_LIBRARY)
# Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
if (ASSIMP_FOUND)
+18 -17
View File
@@ -60,7 +60,7 @@ else()
# Find include files
find_path(
GLFW_INCLUDE_DIR
NAMES GLFW/glfw.h
NAMES GLFW/glfw3.h
PATHS
/usr/include
/usr/local/include
@@ -70,22 +70,23 @@ else()
# Find library files
# Try to use static libraries
find_library(
GLFW_LIBRARY
NAMES glfw3
PATHS
/usr/lib64
/usr/lib
/usr/local/lib64
/usr/local/lib
/sw/lib
/opt/local/lib
${GLFW_ROOT}/lib
DOC "The GLFW library")
#find_library(
# GLFW_LIBRARY
# NAMES glfw3
# PATHS
# /usr/lib64
# /usr/lib
# /usr/local/lib64
# /usr/local/lib
# /sw/lib
# /opt/local/lib
# ${GLFW_ROOT}/lib
# DOC "The GLFW library")
set(GLFW_LIBRARY "")
find_file(
GLFW_BINARY
NAMES glfw3.so
NAMES libglfw${CMAKE_DEBUG_POSTFIX}.so
PATHS
/usr/lib64
/usr/lib
@@ -93,12 +94,12 @@ else()
/usr/local/lib
/sw/lib
/opt/local/lib
${GLFW_ROOT}/lib
${GLFW_ROOT}/src
)
endif()
# Handle REQUIRD argument, define *_FOUND variable
find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY GLFW_BINARY)
find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_BINARY)
# Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
if (GLFW_FOUND)
+2 -1
View File
@@ -32,12 +32,13 @@ else()
# Find include files
find_path(
GLM_INCLUDE_DIR
NAMES GLM/glfw.h
NAMES glm/glm.hpp
PATHS
/usr/include
/usr/local/include
/sw/include
/opt/local/include
${GLM_ROOT}
DOC "The directory where GLM/glm.h resides")
endif()
+10 -7
View File
@@ -49,6 +49,7 @@ if (WIN32)
PATHS
${SLANG_BINARY_PATH})
else()
set(SLANG_BINARY_PATH ${SLANG_ROOT}/bin/linux-${CMAKE_PLATFORM}/release/)
# Find include files
find_path(
SLANG_INCLUDE_DIR
@@ -58,13 +59,15 @@ else()
/usr/local/include
/sw/include
/opt/local/include
${SLANG_ROOT}
DOC "The directory where GL/glfw.h resides")
# Find library files
# Try to use static libraries
set(SLANG_LIBRARY "")
find_library(
SLANG_LIBRARY
NAMES slang.a
SLANG_BINARY
NAMES libslang.so
PATHS
/usr/lib64
/usr/lib
@@ -72,12 +75,12 @@ else()
/usr/local/lib
/sw/lib
/opt/local/lib
${SLANG_ROOT}/lib
${SLANG_BINARY_PATH}
DOC "The SLANG library")
find_file(
SLANG_BINARY
NAMES slang.so
SLANG_GLSLANG
NAMES libslang-glslang.so
PATHS
/usr/lib64
/usr/lib
@@ -85,12 +88,12 @@ else()
/usr/local/lib
/sw/lib
/opt/local/lib
${SLANG_ROOT}/lib
${SLANG_BINARY_PATH}
)
endif()
# Handle REQUIRD argument, define *_FOUND variable
find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_LIBRARY SLANG_BINARY SLANG_GLSLANG)
find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_BINARY SLANG_GLSLANG)
# Define SLANG_LIBRARIES and SLANG_INCLUDE_DIRS
if (SLANG_FOUND)
+1
View File
@@ -38,6 +38,7 @@ else()
/usr/local/include
/sw/include
/opt/local/include
${STB_ROOT}
DOC "The directory where STB/stb.h resides")
endif()
+2 -1
View File
@@ -14,6 +14,7 @@ set(BUILD_SHARED_LIBS ON CACHE INTERNAL "")
add_subdirectory(${ASSIMP_ROOT} ${ASSIMP_ROOT})
target_compile_definitions(assimp PRIVATE _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
target_compile_options(assimp PRIVATE -Wno-error)
#-------------BOOST----------------
list(APPEND DEPENDENCIES boost)
@@ -31,7 +32,7 @@ ExternalProject_Add(boost
INSTALL_COMMAND "")
list (APPEND EXTRA_CMAKE_ARGS
-DBoost_NO_SYSTEM_PATHS=ON)
-DBoost_NO_SYSTEM_PATHS=OFF)
#--------------------JSON------------------
list(APPEND DEPENDENCIES nlohmann_json)