From: Kefu Chai Date: Tue, 10 Oct 2017 11:30:42 +0000 (+0800) Subject: cmake: set supported language the right way X-Git-Tag: v13.0.1~613^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18216%2Fhead;p=ceph.git cmake: set supported language the right way the second param of enable_launage() is not used, we should call it multiple times to enable more than one language. switch to project() command for simplicity. Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b76c557ebba3..3b87d963837a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.11) -project(ceph) +project(ceph CXX C ASM) set(VERSION 12.1.2) if(POLICY CMP0046) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 77d0f981988c..02641dcb24b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ include(GetGitRevisionDescription) -enable_language(C ASM) include(GNUInstallDirs) # for erasure and compressor plugins set(CMAKE_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})