Temporary commit to investigate build error

This commit is contained in:
Dynamitos
2020-08-11 21:23:20 +02:00
parent f27859a02c
commit 839be06f90
24 changed files with 107 additions and 54 deletions
+5 -5
View File
@@ -29,11 +29,11 @@ if (WIN32)
${GLFW_ROOT}/include
DOC "The directory where GLFW/glfw.h resides")
# Use glfw3.lib for static library
# Use glfw3(d).lib for static library
if (GLFW_USE_STATIC_LIBS)
set(GLFW_LIBRARY_NAME glfw3)
set(GLFW_LIBRARY_NAME glfw3${CMAKE_DEBUG_POSTFIX})
else()
set(GLFW_LIBRARY_NAME glfw3ddll)
set(GLFW_LIBRARY_NAME glfw3${CMAKE_DEBUG_POSTFIX}dll)
endif()
# Find library files
@@ -50,7 +50,7 @@ if (WIN32)
find_file(
GLFW_BINARY
NAMES glfw3.dll
NAMES glfw3${CMAKE_DEBUG_POSTFIX}.dll
PATHS
$ENV{PROGRAMFILES}/bin
${GLFW_ROOT}/src
@@ -102,7 +102,7 @@ find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY
# Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
if (GLFW_FOUND)
set(GLFW_LIBRARIES ${OPENGL_LIBRARIES} ${GLFW_LIBRARY})
set(GLFW_LIBRARIES ${GLFW_LIBRARY})
set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_DIR})
endif()
+1 -3
View File
@@ -2,8 +2,6 @@ include (ExternalProject)
set(DEPENDENCIES)
set(EXTRA_CMAKE_ARGS)
execute_process(COMMAND git submodule update --init --recursive -- ${CMAKE_SOURCE_DIR})
#------------ASSIMP---------------
list(APPEND DEPENDENCIES assimp)
set(ASSIMP_BUILD_TESTS OFF CACHE INTERNAL "")
@@ -72,7 +70,7 @@ if(WIN32)
ExternalProject_Add(slang
SOURCE_DIR ${SLANG_ROOT}
BINARY_DIR ${CMAKE_BINARY_DIR}/lib
CONFIGURE_COMMAND ""#devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj
CONFIGURE_COMMAND devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj
BUILD_COMMAND msbuild -p:Configuration=Release -p:WarningLevel=0 -p:Platform=${CMAKE_PLATFORM} -p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj
INSTALL_COMMAND "")