]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: set supported language the right way 18216/head
authorKefu Chai <kchai@redhat.com>
Tue, 10 Oct 2017 11:30:42 +0000 (19:30 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 10 Oct 2017 11:54:31 +0000 (19:54 +0800)
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 <kchai@redhat.com>
CMakeLists.txt
src/CMakeLists.txt

index b76c557ebba3421db28987ba78aa72f038144f65..3b87d963837ad1201ae85b5079d698a495a47746 100644 (file)
@@ -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)
index 77d0f981988c64cfcd457eafc899b2554245e932..02641dcb24b15ea3113978a9e7b6ba57278e0e3e 100644 (file)
@@ -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})