[Groonga-commit] groonga/groonga at 9f8efd4 [master] cmake: don't define variable when required condition isn't satisfied

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Feb 24 21:21:09 JST 2015


Kouhei Sutou	2015-02-24 21:21:09 +0900 (Tue, 24 Feb 2015)

  New Revision: 9f8efd4f017443d05eb19dcd4df09fd045d82965
  https://github.com/groonga/groonga/commit/9f8efd4f017443d05eb19dcd4df09fd045d82965

  Message:
    cmake: don't define variable when required condition isn't satisfied

  Modified files:
    CMakeLists.txt

  Modified: CMakeLists.txt (+7 -7)
===================================================================
--- CMakeLists.txt    2015-02-24 21:19:58 +0900 (3286f51)
+++ CMakeLists.txt    2015-02-24 21:21:09 +0900 (05e0321)
@@ -26,13 +26,6 @@ else()
   set(GRN_BUNDLED TRUE)
 endif()
 
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-  set(CMAKE_COMPILER_IS_CLANGC ON)
-endif()
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(CMAKE_COMPILER_IS_CLANGCXX ON)
-endif()
-
 if(MSVC)
   if(MSVC_VERSION LESS 1800)
     set(GRN_OLD_MSVC_MESSAGE "Groonga supports only MSVC 2013 or later")
@@ -45,6 +38,13 @@ if(MSVC)
   endif()
 endif()
 
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  set(CMAKE_COMPILER_IS_CLANGC ON)
+endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  set(CMAKE_COMPILER_IS_CLANGCXX ON)
+endif()
+
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/base_version" VERSION)
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version.sh")
   file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version.sh" GRN_VERSION)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index