Search
SailfishOS Open Build Service
>
Projects
>
home:cxl000
:
branches:home:cxl000:hawaii
>
kde-solid
> kde-solid-cmakelist-fixes.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File kde-solid-cmakelist-fixes.patch of Package kde-solid
--- kde-solid/CMakeLists.txt 2013-05-12 05:48:35.000000000 -0400 +++ a/CMakeLists.txt 2013-05-19 21:26:18.335317880 -0400 @@ -9,7 +9,7 @@ find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Xml Concurrent DBus Widgets Test) +find_package(Qt5Core REQUIRED NO_MODULE COMPONENTS Xml Concurrent DBus Widgets Test) include(FeatureSummary) include(CMakePackageConfigHelpers) @@ -64,6 +64,7 @@ remove_definitions(-DQT_NO_KEYWORDS) remove_definitions(-DQT_USE_FAST_CONCATENATION) remove_definitions(-DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-fPIC) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) --- kde-solid/src/solid/CMakeLists.txt 2013-05-19 21:28:35.924000147 -0400 +++ a/src/solid/CMakeLists.txt 2013-05-19 17:58:24.727515893 -0400 @@ -1,5 +1,7 @@ include (CheckCXXSourceCompiles) +find_package(Qt5Core REQUIRED) +find_package(Qt5DBus REQUIRED) if(MSVC) check_cxx_source_compiles("int main() { __asm { pxor mm0, mm0 }; }" HAVE_X86_MMX) check_cxx_source_compiles("int main() { __asm { xorps xmm0, xmm0 }; }" HAVE_X86_SSE) @@ -406,10 +408,10 @@ target_include_directories(Solid PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") generate_export_header(Solid) -target_link_libraries(Solid LINK_PUBLIC Qt5::Core - LINK_PRIVATE Qt5::DBus - Qt5::Xml - Qt5::Widgets +target_link_libraries(Solid LINK_PUBLIC Qt5Core + LINK_PRIVATE Qt5DBus + Qt5Xml + Qt5Widgets ${solid_OPTIONAL_LIBS} ) @@ -429,8 +431,8 @@ add_library(Solid_static STATIC ${solid_LIB_SRCS}) set_target_properties(Solid_static PROPERTIES COMPILE_FLAGS -DSOLID_STATIC_DEFINE=1) -target_link_libraries(Solid_static LINK_PUBLIC Qt5::Core) -target_link_libraries(Solid_static Qt5::DBus Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS}) +target_link_libraries(Solid_static LINK_PUBLIC Qt5Core) +target_link_libraries(Solid_static Qt5DBus Qt5Xml Qt5Widgets ${solid_OPTIONAL_LIBS}) target_include_directories(Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") ########### install files ###############