diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2013-08-19 22:22:16 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-08-19 23:24:54 -0700 |
| commit | 73487244dcc40106e421c8ed917bc5c2ef080aef (patch) | |
| tree | b112048c6cb1ccc17375dc4035aa39b6cc1a3779 | |
| parent | cc7a3345b97fd957d4e74b39caff80a992971879 (diff) | |
cmake: Remove project name hack for GNUInstallDirs
Rename the project 'waffle' -> 'waffle1'. This coincides better with
Waffle's library versioning. It also removes the need for the ugly hack
Waffle uses to control where GNUInstallDirs installs documentation.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6d5da1..625ea8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") -project(waffle C) +project(waffle1 C) cmake_minimum_required(VERSION 2.8) @@ -35,18 +35,7 @@ cmake_minimum_required(VERSION 2.8) include(Options.cmake) include(WaffleDefineVersion) include(WaffleCheckThreadLocalStorage) - -# -# Include GNUInstallDirs. -# -# Hackishly rename PROJECT_NAME temporarily in order to workaround the default -# of CMAKE_INSTALL_DOCDIR. The default value is "DATAROOTDIR/doc/PROJECT_NAME", -# which evaluates to the undesirable "DATAROOTDIR/doc/waffle". Instead, we -# want to install to "DATAROOTDIR/doc/waffle-MAJOR_VERSION". -# -set(PROJECT_NAME "waffle-${waffle_major_version}") include(GNUInstallDirs) -set(PROJECT_NAME "waffle") find_package(PkgConfig) |