Skip to content

Commit 99565bb

Browse files
authored
Move feature summary to root CMakeLists (#383)
1 parent 06e6de5 commit 99565bb

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ Generating build files for OpenShot with CMake ${CMAKE_VERSION}
6666
# in order to properly configure CMAKE_INSTALL_LIBDIR path
6767
include(GNUInstallDirs)
6868

69+
# Collect and display summary of options/dependencies
70+
include(FeatureSummary)
71+
72+
################ OPTIONS ##################
73+
# Optional build settings for libopenshot
74+
option(USE_SYSTEM_JSONCPP "Use system installed JsonCpp, if found" ON)
75+
option(DISABLE_BUNDLED_JSONCPP "Don't fall back to bundled JsonCpp" OFF)
76+
option(ENABLE_IWYU "Enable 'Include What You Use' scanner (CMake 3.3+)" OFF)
77+
6978
########## Configure Version.h header ##############
7079
configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY)
7180
# We'll want that installed later
@@ -111,3 +120,9 @@ endif()
111120
if(NOT DISABLE_TESTS)
112121
add_subdirectory(tests)
113122
endif()
123+
124+
########### PRINT FEATURE SUMMARY ##############
125+
feature_summary(WHAT ALL
126+
INCLUDE_QUIET_PACKAGES
127+
FATAL_ON_MISSING_REQUIRED_PACKAGES
128+
DESCRIPTION "Displaying feature summary\n\nBuild configuration:")

src/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
# Collect and display summary of options/dependencies
2828
include(FeatureSummary)
2929

30-
################ OPTIONS ##################
31-
# Optional build settings for libopenshot
32-
option(USE_SYSTEM_JSONCPP "Use system installed JsonCpp, if found" ON)
33-
option(DISABLE_BUNDLED_JSONCPP "Don't fall back to bundled JsonCpp" OFF)
34-
option(ENABLE_IWYU "Enable 'Include What You Use' scanner (CMake 3.3+)" OFF)
35-
3630
# Automatically process Qt classes with meta-object compiler
3731
set(CMAKE_AUTOMOC True)
3832

@@ -426,12 +420,6 @@ ENDIF (BLACKMAGIC_FOUND)
426420
############### INCLUDE SWIG BINDINGS ################
427421
add_subdirectory(bindings)
428422

429-
########### PRINT FEATURE SUMMARY ##############
430-
feature_summary(WHAT ALL
431-
INCLUDE_QUIET_PACKAGES
432-
FATAL_ON_MISSING_REQUIRED_PACKAGES
433-
DESCRIPTION "Displaying feature summary\n\nBuild configuration:")
434-
435423
############### INSTALL HEADERS & LIBRARY ################
436424
set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) # determine correct lib folder
437425

0 commit comments

Comments
 (0)