Explorar el Código

Fix 'rake scaffolding' task for Windows host. [ci skip]

Yao Wei Tjong 姚伟忠 hace 11 años
padre
commit
e9167c3645
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      Rakefile

+ 3 - 2
Rakefile

@@ -237,6 +237,7 @@ EOF" or abort 'Failed to create release directory remotely'
 end
 
 def scaffolding(dir, project = 'Scaffolding', target = 'Main')
+  path_suffix = ENV['OS'] ? '' : 'Urho3D/'
   build_script = <<EOF
 # Set project name
 project (#{project})
@@ -258,8 +259,8 @@ endif ()
 # Set CMake modules search path
 set (CMAKE_MODULE_PATH
     $ENV{URHO3D_HOME}/Source/CMake/Modules
-    $ENV{CMAKE_PREFIX_PATH}/share/Urho3D/CMake/Modules
-    ${CMAKE_INSTALL_PREFIX}/share/Urho3D/CMake/Modules
+    $ENV{CMAKE_PREFIX_PATH}/share/#{path_suffix}CMake/Modules
+    ${CMAKE_INSTALL_PREFIX}/share/#{path_suffix}CMake/Modules
     CACHE PATH \"Path to Urho3D-specific CMake modules\")
 
 # Include Urho3D CMake common module