coroutines on windows...
This commit is contained in:
@@ -92,7 +92,7 @@ find_package_handle_standard_args(NSAM DEFAULT_MSG NSAM_INCLUDE_DIR NSAM_LIBRARY
|
||||
if (NSAM_FOUND)
|
||||
set(NSAM_LIBRARIES ${NSAM_LIBRARY})
|
||||
set(NSAM_INCLUDE_DIRS ${NSAM_INCLUDE_DIR})
|
||||
set(NSAM_BINARIES ${NSAM_BINARY} ${NSAM_LLVM})
|
||||
set(NSAM_BINARIES ${NSAM_BINARY})
|
||||
endif()
|
||||
|
||||
# Hide some variables
|
||||
|
||||
@@ -38,7 +38,8 @@ if (WIN32)
|
||||
NAMES assimp-vc${MSVC_TOOLSET_VERSION}-mt${CMAKE_DEBUG_POSTFIX}.dll
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/bin
|
||||
${ASSIMP_ROOT}/bin)
|
||||
${ASSIMP_ROOT}/code
|
||||
PATH_SUFFIXES Debug Release)
|
||||
else()
|
||||
# Find include files
|
||||
find_path(
|
||||
|
||||
@@ -48,15 +48,15 @@ if (WIN32)
|
||||
|
||||
unset(GLFW_LIBRARY_NAME)
|
||||
|
||||
#find_file(
|
||||
# GLFW_BINARY
|
||||
# NAMES glfw3${CMAKE_DEBUG_POSTFIX}.dll
|
||||
# PATHS
|
||||
# $ENV{PROGRAMFILES}/bin
|
||||
# ${CMAKE_BINARY_DIR}
|
||||
# ${GLFW_ROOT}/src
|
||||
# ${GLFW_ROOT}/bin
|
||||
# PATH_SUFFIXES Debug Release)
|
||||
find_file(
|
||||
GLFW_BINARY
|
||||
NAMES glfw3${CMAKE_DEBUG_POSTFIX}.dll
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/bin
|
||||
${CMAKE_BINARY_DIR}
|
||||
${GLFW_ROOT}/src
|
||||
${GLFW_ROOT}/bin
|
||||
PATH_SUFFIXES Debug Release)
|
||||
else()
|
||||
# Find include files
|
||||
find_path(
|
||||
|
||||
+50
-40
@@ -17,47 +17,56 @@
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
if (WIN32)
|
||||
# Find include files
|
||||
find_path(
|
||||
KTX_INCLUDE_DIR
|
||||
NAMES ktx.h
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/include
|
||||
${KTX_ROOT}/include
|
||||
DOC "The directory where ktx.h resides")
|
||||
# Find include files
|
||||
find_path(
|
||||
KTX_INCLUDE_DIR
|
||||
NAMES ktx.h
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/include
|
||||
${KTX_ROOT}/include
|
||||
DOC "The directory where ktx.h resides")
|
||||
|
||||
# Find library files
|
||||
find_library(
|
||||
KTX_LIBRARY
|
||||
NAMES ktx${CMAKE_DEBUG_POSTFIX}.lib
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/lib
|
||||
${KTX_ROOT}
|
||||
${KTX_ROOT}/lib
|
||||
PATH_SUFFIXES Debug Release)
|
||||
# Find library files
|
||||
find_library(
|
||||
KTX_LIBRARY
|
||||
NAMES ktx${CMAKE_DEBUG_POSTFIX}.lib
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/lib
|
||||
${KTX_ROOT}
|
||||
${KTX_ROOT}/lib
|
||||
PATH_SUFFIXES Debug Release)
|
||||
|
||||
find_file(
|
||||
KTX_BINARY
|
||||
NAMES ktx${CMAKE_DEBUG_POSTFIX}.dll
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/lib
|
||||
${KTX_ROOT}
|
||||
${KTX_ROOT}/lib
|
||||
PATH_SUFFIXES Debug Release)
|
||||
else()
|
||||
# Find include files
|
||||
find_path(
|
||||
KTX_INCLUDE_DIR
|
||||
NAMES ktx.h
|
||||
PATHS
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
${KTX_ROOT}
|
||||
DOC "The directory where KTX/ktx.h resides")
|
||||
# Find include files
|
||||
find_path(
|
||||
KTX_INCLUDE_DIR
|
||||
NAMES ktx.h
|
||||
PATHS
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
${KTX_ROOT}
|
||||
DOC "The directory where KTX/ktx.h resides")
|
||||
|
||||
find_library(
|
||||
KTX_LIBRARY
|
||||
NAMES libktx${CMAKE_DEBUG_POSTFIX}.so
|
||||
PATHS
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
${KTX_ROOT}
|
||||
DOC "The directory where KTX/libktx.so resides")
|
||||
find_library(
|
||||
KTX_LIBRARY
|
||||
NAMES libktx${CMAKE_DEBUG_POSTFIX}.so
|
||||
PATHS
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
${KTX_ROOT}
|
||||
DOC "The directory where KTX/libktx.so resides")
|
||||
endif()
|
||||
|
||||
# Handle REQUIRD argument, define *_FOUND variable
|
||||
@@ -65,8 +74,9 @@ find_package_handle_standard_args(KTX DEFAULT_MSG KTX_INCLUDE_DIR KTX_LIBRARY)
|
||||
|
||||
# Define KTX_LIBRARIES and KTX_INCLUDE_DIRS
|
||||
if (KTX_FOUND)
|
||||
set(KTX_INCLUDE_DIRS ${KTX_INCLUDE_DIR})
|
||||
set(KTX_LIBRARIES ${KTX_LIBRARY})
|
||||
set(KTX_INCLUDE_DIRS ${KTX_INCLUDE_DIR})
|
||||
set(KTX_LIBRARIES ${KTX_LIBRARY})
|
||||
set(KTX_BINARIES ${KTX_BINARY})
|
||||
endif()
|
||||
|
||||
# Hide some variables
|
||||
|
||||
@@ -73,7 +73,7 @@ find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_LIBR
|
||||
|
||||
# Define SLANG_LIBRARIES and SLANG_INCLUDE_DIRS
|
||||
if (SLANG_FOUND)
|
||||
set(SLANG_BINARIES ${SLANG_BINARY} ${SLANG_GLSLANG})
|
||||
set(SLANG_BINARIES ${SLANG_BINARY})
|
||||
set(SLANG_LIBRARIES ${SLANG_LIBRARY})
|
||||
set(SLANG_INCLUDE_DIRS ${SLANG_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user