Skip to content

ENH: Add NO_SOURCE_GROUPS option to ctkBuild macros #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kislinsk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ENH: Add NO_SOURCE_GROUPS option to ctkBuild macros #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CMake/ctkMacroBuildApp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ macro(ctkMacroBuildApp)
${my_library_dirs}
)

source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
if(NOT CTK_NO_SOURCE_GROUPS)
source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
endif()

# Create executable
ctk_add_executable_utf8(${proj_name}
Expand Down
10 changes: 6 additions & 4 deletions CMake/ctkMacroBuildLib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,12 @@ ${${MY_EXPORT_CUSTOM_CONTENT_FROM_VARIABLE}}
set(dynamicHeaders
"${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")

source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
if(NOT CTK_NO_SOURCE_GROUPS)
source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
endif()

add_library(${lib_name} ${MY_LIBRARY_TYPE}
${MY_SRCS}
Expand Down
18 changes: 10 additions & 8 deletions CMake/ctkMacroBuildPlugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,17 @@ macro(ctkMacroBuildPlugin)
)
endif()

source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
${MY_TRANSLATIONS}
)
if(NOT CTK_NO_SOURCE_GROUPS)
source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
${MY_TRANSLATIONS}
)

source_group("Generated" FILES
${_plugin_qm_files}
)
source_group("Generated" FILES
${_plugin_qm_files}
)
endif()

add_library(${lib_name} ${MY_LIBRARY_TYPE}
${MY_SRCS}
Expand Down
10 changes: 6 additions & 4 deletions CMake/ctkMacroBuildQtPlugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,12 @@ macro(ctkMacroBuildQtPlugin)
set(dynamicHeaders
"${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")

source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
if(NOT CTK_NO_SOURCE_GROUPS)
source_group("Resources" FILES
${MY_RESOURCES}
${MY_UI_FORMS}
)
endif()

add_library(${lib_name} ${MY_LIBRARY_TYPE}
${MY_SRCS}
Expand Down
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,11 @@ option(CTK_BUILD_QTDESIGNER_PLUGINS "Build Qt Designer plugins" ON)
mark_as_advanced(CTK_BUILD_QTDESIGNER_PLUGINS)
mark_as_superbuild(CTK_BUILD_QTDESIGNER_PLUGINS)

# Source groups
option(CTK_NO_SOURCE_GROUPS "Do not categorize sources into source groups" OFF)
mark_as_advanced(CTK_NO_SOURCE_GROUPS)
mark_as_superbuild(CTK_NO_SOURCE_GROUPS)

#-----------------------------------------------------------------------------
# CTK Libraries
#
Expand Down
Loading