drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Be more clear that the only Qt enabled component isn't actually built

Browse Source 
(or apparently even working).
This commit is contained in:
cfcohen 2015-12-05 11:18:14 -05:00
parent 2f99e6734d
commit 228c97725a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -136,9 +136,6 @@ ELSE(OPENMP_FOUND)
MESSAGE(STATUS "Looking for OpenMP - not found")
ENDIF(OPENMP_FOUND)
# Qt
FIND_PACKAGE(Qt4)
# Threads
FIND_PACKAGE(Threads REQUIRED)
MESSAGE(STATUS "Use thread library: ${CMAKE_THREAD_LIBS_INIT}")

9
src/nvtt/tools/CMakeLists.txt
View File

@ -47,7 +47,8 @@ IF(GCONFTOOL2)
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GCONFTOOL2} --makefile-install-rule ${CMAKE_CURRENT_BINARY_DIR}/nvtt-thumbnailer.schema)")
ENDIF(GCONFTOOL2)
# UI tools
# UI tools (not functional)
#FIND_PACKAGE(Qt4)
IF(QT4_FOUND)
SET(QT_USE_QTOPENGL TRUE)
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@ -64,10 +65,10 @@ IF(QT4_FOUND)
QT4_WRAP_UI(UICS compressdialog.ui)
QT4_WRAP_CPP(MOCS compressdialog.h)
#QT4_ADD_RESOURCES(RCCS ui/configdialog.rc)
QT4_ADD_RESOURCES(RCCS ui/configdialog.rc)
#ADD_EXECUTABLE(nvtt-diag MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
#TARGET_LINK_LIBRARIES(nvtt-diag ${LIBS})
ADD_EXECUTABLE(nvtt-diag MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
TARGET_LINK_LIBRARIES(nvtt-diag ${LIBS})
ENDIF(QT4_FOUND)