napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CMakeModules] fix if loops

Browse Source
This commit is contained in:
Philip 2017-06-18 21:40:02 +02:00
parent 11f9c588d2
commit e8d803b866
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeModules/FindPythonQt.cmake
View File

@ -89,22 +89,19 @@ set(PythonQt_FOUND 0)
if(PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY) if(PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY)
set(PYTHONQT_LIB) set(PYTHONQT_LIB)
endif() elseif(PYTHONQT_LIBRARY_V32 AND PYTHONQT_QTALL_LIBRARY_V32)
if(PYTHONQT_LIBRARY_V32 AND PYTHONQT_QTALL_LIBRARY_V32)
set(PYTHONQT_LIB)
set(PYTHONQT_LIB_V32) set(PYTHONQT_LIB_V32)
endif() endif()
if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIB) if(PYTHONQT_INCLUDE_DIR AND (PYTHONQT_LIB OR PYTHONQT_LIB_V32))
# Currently CMake'ified PythonQt only supports building against a python Release build. # Currently CMake'ified PythonQt only supports building against a python Release build.
# This applies independently of CTK build type (Release, Debug, ...) # This applies independently of CTK build type (Release, Debug, ...)
add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK) add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
set(PYTHONQT_FOUND 1) set(PYTHONQT_FOUND 1)
set(PythonQt_FOUND ${PYTHONQT_FOUND}) set(PythonQt_FOUND ${PYTHONQT_FOUND})
if(PYTHONQT_LIB_V32) if(PYTHONQT_LIB)
set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY_V32} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY_V32})
else
set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY}) set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY})
elseif(PYTHONQT_LIB_V32)
set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY_V32} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY_V32})
endif() endif()
endif() endif()