[Groonga-commit] groonga/groonga at 8f5fe65 [master] cmake windows: don't run shell script on Windows

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Apr 25 12:32:32 JST 2013


Kouhei Sutou	2013-04-25 12:32:32 +0900 (Thu, 25 Apr 2013)

  New Revision: 8f5fe6573b4180aca7dc8e65d5aedd868cef3cd0
  https://github.com/groonga/groonga/commit/8f5fe6573b4180aca7dc8e65d5aedd868cef3cd0

  Message:
    cmake windows: don't run shell script on Windows

  Modified files:
    CMakeLists.txt

  Modified: CMakeLists.txt (+6 -2)
===================================================================
--- CMakeLists.txt    2013-04-25 12:26:58 +0900 (665eb4f)
+++ CMakeLists.txt    2013-04-25 12:32:32 +0900 (dbd3aa3)
@@ -22,9 +22,13 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version.sh")
   file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version.sh" GRN_VERSION)
 else()
   if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/version.sh")
-    execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/version-gen.sh")
+    if(WIN32)
+      set(GRN_VERSION "${VERSION}")
+    else()
+      execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/version-gen.sh")
+      file(READ "${CMAKE_CURRENT_BINARY_DIR}/version.sh" GRN_VERSION)
+    endif()
   endif()
-  file(READ "${CMAKE_CURRENT_BINARY_DIR}/version.sh" GRN_VERSION)
 endif()
 string(REGEX REPLACE "(^.*=|\n)" "" GRN_VERSION "${GRN_VERSION}")
 
-------------- next part --------------
HTML����������������������������...
Download 



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