diff options
author | Marcus Asteborg <maastebo@microsoft.com> | 2020-04-23 08:06:11 +0300 |
---|---|---|
committer | Mark Harris <mark.hsj@gmail.com> | 2020-06-13 10:20:56 +0300 |
commit | 48055ccc235a287c2ccf143a7196281a78a7746d (patch) | |
tree | 7eac98462a67dc99a252393c735a82dfc514c630 | |
parent | f2f8f338731787962971106654273aaa8b912a53 (diff) |
cmake - move cmake related files to cmake folder to make root dir less busy
Signed-off-by: Mark Harris <mark.hsj@gmail.com>
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | Makefile.am | 12 | ||||
-rw-r--r-- | cmake/OpusBuildtype.cmake (renamed from opus_buildtype.cmake) | 0 | ||||
-rw-r--r-- | cmake/OpusConfig.cmake (renamed from opus_config.cmake) | 4 | ||||
-rw-r--r-- | cmake/OpusConfig.cmake.in (renamed from OpusConfig.cmake.in) | 0 | ||||
-rw-r--r-- | cmake/OpusFunctions.cmake (renamed from opus_functions.cmake) | 0 | ||||
-rw-r--r-- | cmake/OpusSources.cmake (renamed from opus_sources.cmake) | 2 | ||||
-rw-r--r-- | cmake/config.h.cmake.in (renamed from config.h.cmake.in) | 0 |
8 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 55bb7c11..942f28e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -include(opus_functions.cmake) +include(OpusFunctions) get_library_version(OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR) message(STATUS "Opus library version: ${OPUS_LIBRARY_VERSION}") @@ -17,7 +17,7 @@ string(REGEX message(STATUS "Opus project version: ${PROJECT_VERSION}") project(Opus LANGUAGES C VERSION ${PROJECT_VERSION}) -include(opus_buildtype.cmake) +include(OpusBuildtype) option(OPUS_BUILD_SHARED_LIBRARY "Build shared library" OFF) option(OPUS_STACK_PROTECTOR "Use stack protection" ON) @@ -41,8 +41,8 @@ if(APPLE) option(OPUS_BUILD_FRAMEWORK "Build Framework bundle for Apple systems" OFF) endif() -include(opus_config.cmake) -include(opus_sources.cmake) +include(OpusConfig) +include(OpusSources) include(GNUInstallDirs) include(CMakeDependentOption) include(FeatureSummary) @@ -490,7 +490,7 @@ if(OPUS_INSTALL_CMAKE_CONFIG_MODULE) include(CMakePackageConfigHelpers) set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) - configure_package_config_file(OpusConfig.cmake.in + configure_package_config_file(${CMAKE_SOURCE_DIR}/cmake/OpusConfig.cmake.in OpusConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} diff --git a/Makefile.am b/Makefile.am index 6d579fe4..e3847bf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,13 +215,13 @@ EXTRA_DIST = opus.pc.in \ Makefile.mips \ Makefile.unix \ CMakeLists.txt \ - config.h.cmake.in \ - opus_buildtype.cmake \ - opus_config.cmake \ - opus_functions.cmake \ - opus_sources.cmake \ - OpusConfig.cmake.in \ cmake/CFeatureCheck.cmake \ + cmake/OpusBuildtype.cmake \ + cmake/OpusConfig.cmake \ + cmake/OpusConfig.cmake.in \ + cmake/OpusFunctions.cmake \ + cmake/OpusSources.cmake \ + cmake/config.h.cmake.in \ cmake/vla.c \ tests/run_vectors.sh \ celt/arm/arm2gnu.pl \ diff --git a/opus_buildtype.cmake b/cmake/OpusBuildtype.cmake index aaee9eff..aaee9eff 100644 --- a/opus_buildtype.cmake +++ b/cmake/OpusBuildtype.cmake diff --git a/opus_config.cmake b/cmake/OpusConfig.cmake index bcc78ccf..cb20e7fc 100644 --- a/opus_config.cmake +++ b/cmake/OpusConfig.cmake @@ -1,6 +1,6 @@ -include(opus_functions.cmake) +include(OpusFunctions) -configure_file(config.h.cmake.in config.h @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/cmake/config.h.cmake.in config.h @ONLY) add_definitions(-DHAVE_CONFIG_H) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/OpusConfig.cmake.in b/cmake/OpusConfig.cmake.in index 0b21231d..0b21231d 100644 --- a/OpusConfig.cmake.in +++ b/cmake/OpusConfig.cmake.in diff --git a/opus_functions.cmake b/cmake/OpusFunctions.cmake index a3ac1c09..a3ac1c09 100644 --- a/opus_functions.cmake +++ b/cmake/OpusFunctions.cmake diff --git a/opus_sources.cmake b/cmake/OpusSources.cmake index 032e574f..d8c6cdf4 100644 --- a/opus_sources.cmake +++ b/cmake/OpusSources.cmake @@ -1,4 +1,4 @@ -include(opus_functions.cmake) +include(OpusFunctions) get_opus_sources(SILK_HEAD silk_headers.mk silk_headers) get_opus_sources(SILK_SOURCES silk_sources.mk silk_sources) diff --git a/config.h.cmake.in b/cmake/config.h.cmake.in index 5550842c..5550842c 100644 --- a/config.h.cmake.in +++ b/cmake/config.h.cmake.in |