Skip to content

Commit 5ac1eca

Browse files
author
feihong
committed
prefer to use ${CMAKE_CURRENT_LIST_DIR}/generated_cpp
1 parent 6bbd177 commit 5ac1eca

File tree

3 files changed

+34
-15
lines changed

3 files changed

+34
-15
lines changed

CMakeLists.txt

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,29 @@ find_package(Python3 COMPONENTS Development)
1010

1111
set(PYTHONQT_SUFFIX Qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}-Python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
1212

13+
add_subdirectory(generator)
1314

14-
if(${QT_VERSION_MAJOR} VERSION_EQUAL 5)
15-
if(${QT_VERSION_MINOR} VERSION_LESS 3)
16-
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_50)
17-
elseif(${QT_VERSION_MINOR} VERSION_LESS 6)
18-
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_54)
19-
elseif(${QT_VERSION_MINOR} VERSION_LESS 11)
20-
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_56)
21-
elseif(${QT_VERSION_MINOR} VERSION_LESS 15)
22-
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_511)
15+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp)
16+
if(NOT EXISTS ${PYTHONQT_GENERATED_PATH})
17+
if(${QT_VERSION_MAJOR} VERSION_EQUAL 5)
18+
if(${QT_VERSION_MINOR} VERSION_LESS 3)
19+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_50)
20+
elseif(${QT_VERSION_MINOR} VERSION_LESS 6)
21+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_54)
22+
elseif(${QT_VERSION_MINOR} VERSION_LESS 11)
23+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_56)
24+
elseif(${QT_VERSION_MINOR} VERSION_LESS 15)
25+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_511)
26+
else()
27+
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_515)
28+
endif()
29+
# elseif(${QT_VERSION_MAJOR} VERSION_EQUAL 6)
2330
else()
24-
set(PYTHONQT_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/generated_cpp_515)
31+
message(FATAL "No generated sources exist for Qt${QT_VERSION}")
2532
endif()
26-
# elseif(${QT_VERSION_MAJOR} VERSION_EQUAL 6)
27-
else()
28-
message(FATAL "No generated sources exist for Qt${QT_VERSION}")
2933
endif()
3034

3135
add_subdirectory(src)
32-
add_subdirectory(generator)
3336
add_subdirectory(extensions)
3437
add_subdirectory(tests)
3538
# add_subdirectory(examples)

generator/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,16 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
2323
)
2424

2525
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
26+
27+
# file(GLOB resources_files *.txt *.xml)
28+
# foreach(resources_file IN LISTS resources_files)
29+
# configure_file(${resources_file} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
30+
# endforeach()
31+
32+
# file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_cpp")
33+
34+
# add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
35+
# COMMAND set Path="%Path%;"
36+
# COMMAND $<TARGET_FILE:${PROJECT_NAME}>
37+
# WORKING_DIRECTORY $<TARGET_FILE_DIR:${PROJECT_NAME}>
38+
# )

tests/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
1919
QtAll
2020
)
2121

22-
add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
22+
add_test(NAME ${PROJECT_NAME}
23+
COMMAND $<TARGET_FILE:${PROJECT_NAME}>
24+
WORKING_DIRECTORY $<TARGET_FILE_DIR:${PROJECT_NAME}>
25+
)

0 commit comments

Comments
 (0)