kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a return-after-error if an old Qt is found. 

No need for an else after a return.
This commit is contained in:
Stephen Kelly 2012-08-17 20:09:43 +02:00
parent 8f996a96f4
commit bd728f6fee
1 changed files with 103 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Source/QtDialog/CMakeLists.txt
View File

@ -15,11 +15,12 @@ find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND) if(NOT QT4_FOUND)
message(SEND_ERROR "Failed to find Qt 4.4 or greater.") message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
else() return()
endif()
include(${QT_USE_FILE}) include(${QT_USE_FILE})
set(CMAKE_PACKAGE_QTGUI TRUE) set(CMAKE_PACKAGE_QTGUI TRUE)
set(SRCS set(SRCS
AddCacheEntry.cxx AddCacheEntry.cxx
AddCacheEntry.h AddCacheEntry.h
CMakeSetup.cxx CMakeSetup.cxx
@ -36,14 +37,14 @@ else()
QMacInstallDialog.cxx QMacInstallDialog.cxx
QMacInstallDialog.h QMacInstallDialog.h
) )
QT4_WRAP_UI(UI_SRCS QT4_WRAP_UI(UI_SRCS
CMakeSetupDialog.ui CMakeSetupDialog.ui
Compilers.ui Compilers.ui
CrossCompiler.ui CrossCompiler.ui
AddCacheEntry.ui AddCacheEntry.ui
MacInstallDialog.ui MacInstallDialog.ui
) )
QT4_WRAP_CPP(MOC_SRCS QT4_WRAP_CPP(MOC_SRCS
AddCacheEntry.h AddCacheEntry.h
Compilers.h Compilers.h
CMakeSetupDialog.h CMakeSetupDialog.h
@ -53,44 +54,44 @@ else()
QCMakeWidgets.h QCMakeWidgets.h
QMacInstallDialog.h QMacInstallDialog.h
) )
QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS}) set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
if(Q_WS_WIN) if(Q_WS_WIN)
set(SRCS ${SRCS} CMakeSetup.rc) set(SRCS ${SRCS} CMakeSetup.rc)
endif() endif()
if(Q_WS_MAC) if(Q_WS_MAC)
set(SRCS ${SRCS} CMakeSetup.icns) set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES set_source_files_properties(CMakeSetup.icns PROPERTIES
MACOSX_PACKAGE_LOCATION Resources) MACOSX_PACKAGE_LOCATION Resources)
endif() endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
if(APPLE) if(APPLE)
set_target_properties(cmake-gui PROPERTIES set_target_properties(cmake-gui PROPERTIES
OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
endif() endif()
set(CMAKE_INSTALL_DESTINATION_ARGS set(CMAKE_INSTALL_DESTINATION_ARGS
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
endif() endif()
install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS}) install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
if(UNIX) if(UNIX)
# install a desktop file so CMake appears in the application start menu # install a desktop file so CMake appears in the application start menu
# with an icon # with an icon
install(FILES CMake.desktop DESTINATION share/applications ) install(FILES CMake.desktop DESTINATION share/applications )
install(FILES CMakeSetup32.png DESTINATION share/pixmaps ) install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
install(FILES cmakecache.xml DESTINATION share/mime/packages ) install(FILES cmakecache.xml DESTINATION share/mime/packages )
endif() endif()
if(APPLE) if(APPLE)
set(CMAKE_POSTFLIGHT_SCRIPT set(CMAKE_POSTFLIGHT_SCRIPT
"${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
set(CMAKE_POSTUPGRADE_SCRIPT set(CMAKE_POSTUPGRADE_SCRIPT
@ -101,9 +102,9 @@ else()
"${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh") "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
install(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui install(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
endif() endif()
if(APPLE OR WIN32) if(APPLE OR WIN32)
# install rules for including 3rd party libs such as Qt # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}") set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
@ -115,9 +116,7 @@ else()
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\") fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
") ")
endif()
configure_file("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
"${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
endif() endif()
configure_file("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
"${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)