gogacoder/QtPropertyBrowser
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added QT targets as dependency

Browse Source
This commit is contained in:
Abhijit Kundu
2014-12-01 14:21:54 -05:00
parent 2b32e13c59
commit d9be47ebe2
8 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/canvas_typed/CMakeLists.txt
View File

@@ -16,4 +16,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

2
examples/canvas_variant/CMakeLists.txt
View File

@@ -16,4 +16,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

2
examples/decoration/CMakeLists.txt
View File

@@ -12,4 +12,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

2
examples/demo/CMakeLists.txt
View File

@@ -16,4 +16,4 @@ ELSE()
ENDIF() ENDIF()
ADD_EXECUTABLE(${example_name} ${KIT_SRCS} ${KIT_QRC_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS} ${KIT_QRC_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

2
examples/extension/CMakeLists.txt
View File

@@ -12,4 +12,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

2
examples/object_controller/CMakeLists.txt
View File

@@ -13,4 +13,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

3
examples/simple/CMakeLists.txt
View File

@@ -1,4 +1,3 @@
SET(example_name simple) SET(example_name simple)
SET(KIT_SRCS SET(KIT_SRCS
@@ -6,4 +5,4 @@ SET(KIT_SRCS
) )
ADD_EXECUTABLE(${example_name} ${KIT_SRCS}) ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS}) TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})

20
src/CMakeLists.txt
View File

@@ -45,25 +45,25 @@ ELSE()
QT4_ADD_RESOURCES(KIT_QRC_SRCS ${KIT_resources}) QT4_ADD_RESOURCES(KIT_QRC_SRCS ${KIT_resources})
ENDIF() ENDIF()
SET(libname ${PROJECT_NAME}) ADD_LIBRARY(${PROJECT_NAME} STATIC
ADD_LIBRARY(${libname} STATIC
${KIT_SRCS} ${KIT_SRCS}
${KIT_UI_CPP} ${KIT_UI_CPP}
${KIT_MOC_CPP} ${KIT_MOC_CPP}
${KIT_QRC_SRCS} ${KIT_QRC_SRCS}
) )
target_include_directories(${libname} PRIVATE ${QT_INCLUDE_DIRS}) target_include_directories(${PROJECT_NAME} PRIVATE ${QT_INCLUDE_DIRS})
target_compile_definitions(${libname} PRIVATE ${QT_COMPILE_DEFS}) target_compile_definitions(${PROJECT_NAME} PRIVATE ${QT_COMPILE_DEFS})
set_target_properties(${libname} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
SET(${PROJECT_NAME}_LINK_LIBRARIES ${QT_TARGETS})
SET(${PROJECT_NAME}_LINK_LIBRARIES ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
${libname} ${PROJECT_NAME}
${${PROJECT_NAME}_LINK_LIBRARIES} ${${PROJECT_NAME}_LINK_LIBRARIES}
) )
add_dependencies(${PROJECT_NAME} ${QT_TARGETS})
# List of header that should go though moc # List of header that should go though moc
SET(KIT_HEADERS_MOC_SRCS SET(KIT_HEADERS_MOC_SRCS
qtbuttonpropertybrowser.h qtbuttonpropertybrowser.h
@@ -110,7 +110,7 @@ FOREACH(file ${KIT_CPP_MOC_SRCS})
LIST(APPEND KIT_MOC_CPP ${output_file}) LIST(APPEND KIT_MOC_CPP ${output_file})
ENDFOREACH() ENDFOREACH()
add_custom_target(${libname}GenerateMoc add_custom_target(${PROJECT_NAME}GenerateMoc
DEPENDS ${KIT_MOC_CPP} DEPENDS ${KIT_MOC_CPP}
) )
add_dependencies(${libname} ${libname}GenerateMoc) add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}GenerateMoc)