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

Ensure 3rd party libraries are writable. 

This patch fixes CMake.Install when Qt4 is installed read-only by packaging
system like Homebrew.
This commit is contained in:
Nicolas Despres 2012-07-06 12:49:04 +02:00 committed by Peter Kümmel
parent a7b4e3a57b
commit aff0029ee3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/QtDialog/CMakeLists.txt
View File

@ -36,14 +36,14 @@ ELSE(NOT QT4_FOUND)
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
@ -76,7 +76,7 @@ ELSE(NOT QT4_FOUND)
SET_TARGET_PROPERTIES(cmake-gui PROPERTIES SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
ENDIF(APPLE) ENDIF(APPLE)
SET(CMAKE_INSTALL_DESTINATION_ARGS SET(CMAKE_INSTALL_DESTINATION_ARGS
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
@ -112,11 +112,12 @@ ELSE(NOT QT4_FOUND)
endif(APPLE) endif(APPLE)
install(CODE " install(CODE "
include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\") include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
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(APPLE OR WIN32) endif(APPLE OR WIN32)
CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in" CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
"${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY) "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
ENDIF(NOT QT4_FOUND) ENDIF(NOT QT4_FOUND)