diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-09-10 12:10:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 12:10:11 +0200 |
| commit | 48e14b5a243cf2834be741c95ae21e934c30e78d (patch) | |
| tree | bd26ec011ae3ef80e9ee3ff4845666e8f757b163 /project | |
| parent | 968d889449f9ff01a27baecdd7ad7b6a9babed6e (diff) | |
| parent | 2e209b463efde268491b3f10a73a5fcac7d76915 (diff) | |
Merge pull request #10437 from stefansaraev/cmake-optional
cmake cosmetics
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/treedata/common/network.txt | 1 | ||||
| -rw-r--r-- | project/cmake/treedata/common/subdirs.txt | 1 | ||||
| -rw-r--r-- | project/cmake/treedata/optional/common/cdrip.txt | 1 | ||||
| -rw-r--r-- | project/cmake/treedata/optional/common/dacp.txt | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index 64c14e47d6..42c4926ea2 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -44,6 +44,7 @@ option(ENABLE_UPNP "Enable UPnP support?" ON) option(ENABLE_NONFREE "Enable non-free components?" ON) option(ENABLE_AIRTUNES "Enable AirTunes support?" ON) option(ENABLE_CEC "Enable CEC support?" ON) +option(ENABLE_OPTICAL "Enable optical support?" ON) if(UNIX) if(NOT APPLE) option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" ON) @@ -56,7 +57,6 @@ if(UNIX) option(ENABLE_X11 "Enable X11 support?" ON) option(ENABLE_AML "Enable AML?" OFF) endif() - option(ENABLE_OPTICAL "Enable optical support?" ON) endif() # System options if(NOT WIN32) diff --git a/project/cmake/treedata/common/network.txt b/project/cmake/treedata/common/network.txt index 4748f80636..6331b2d17c 100644 --- a/project/cmake/treedata/common/network.txt +++ b/project/cmake/treedata/common/network.txt @@ -1,5 +1,4 @@ xbmc/network network -xbmc/network/dacp network/dacp xbmc/network/httprequesthandler network/httprequesthandler xbmc/network/httprequesthandler/python network/httprequesthandler/python xbmc/network/websocket network/websocket diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt index c2828e0f56..8491b85484 100644 --- a/project/cmake/treedata/common/subdirs.txt +++ b/project/cmake/treedata/common/subdirs.txt @@ -10,7 +10,6 @@ xbmc/addons/binary/interfaces/api1/InputStream api1AddonCallbacks_InputStream xbmc/addons/binary/interfaces/api1/Peripheral api1AddonCallbacks_Peripheral xbmc/addons/binary/interfaces/api1/PVR api1AddonCallbacks_PVR xbmc/commons commons -xbmc/cdrip cdrip xbmc/dbwrappers dbwrappers xbmc/dialogs dialogs xbmc/epg epg diff --git a/project/cmake/treedata/optional/common/cdrip.txt b/project/cmake/treedata/optional/common/cdrip.txt new file mode 100644 index 0000000000..79b53907d4 --- /dev/null +++ b/project/cmake/treedata/optional/common/cdrip.txt @@ -0,0 +1 @@ +xbmc/cdrip cdrip # OPTICAL diff --git a/project/cmake/treedata/optional/common/dacp.txt b/project/cmake/treedata/optional/common/dacp.txt new file mode 100644 index 0000000000..fd225c29ea --- /dev/null +++ b/project/cmake/treedata/optional/common/dacp.txt @@ -0,0 +1 @@ +xbmc/network/dacp network/dacp # AIRTUNES |