Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-11 07:06:13 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cmake bug fixed if BUILD_DX11=OFF but BUILD_TOOLS=ON (#319)

Browse Source
This commit is contained in:
Chuck Walbourn
2023-02-10 19:27:14 -08:00
committed by GitHub
parent 5b06df54e4
commit 1cef43a2bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -224,7 +224,7 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
#--- Command-line tools #--- Command-line tools
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
set(TOOL_EXES texassemble texconv texdiag) set(TOOL_EXES texassemble texconv texdiag)
add_executable(texassemble add_executable(texassemble
@@ -400,7 +400,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(BC_USE_OPENMP) if(BC_USE_OPENMP)
target_compile_options(${PROJECT_NAME} PRIVATE /openmp /Zc:twoPhase-) target_compile_options(${PROJECT_NAME} PRIVATE /openmp /Zc:twoPhase-)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
target_compile_options(texconv PRIVATE /openmp /Zc:twoPhase-) target_compile_options(texconv PRIVATE /openmp /Zc:twoPhase-)
endif() endif()
endif() endif()
@@ -441,7 +441,7 @@ if(WIN32)
endif() endif()
endif() endif()
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv)
endif() endif()