Browse Source

Support spaces in source and/or build tree path for OSX and iOS build.
[ci only: OSX]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
05e4001697
10 changed files with 10 additions and 10 deletions
  1. 1 1
      Source/Urho3D/CMakeLists.txt
  2. 1 1
      cmake_android.sh
  3. 1 1
      cmake_codeblocks.sh
  4. 1 1
      cmake_eclipse.sh
  5. 1 1
      cmake_emscripten.sh
  6. 1 1
      cmake_ios.sh
  7. 1 1
      cmake_macosx.sh
  8. 1 1
      cmake_mingw.sh
  9. 1 1
      cmake_ninja.sh
  10. 1 1
      cmake_rpi.sh

+ 1 - 1
Source/Urho3D/CMakeLists.txt

@@ -239,7 +239,7 @@ foreach (TARGET ${STATIC_LIBRARY_TARGETS})
             set_property (TARGET ${TARGET_NAME} APPEND PROPERTY LINK_LIBRARIES ${FORCE_LOAD} ${ARCHIVE})    # Only works in Apple (Xcode and Makefile) and GCC while building shared library
         endif ()
         if (XCODE OR MSVC)
-            set_property (TARGET ${TARGET_NAME} APPEND_STRING PROPERTY STATIC_LIBRARY_FLAGS " ${ARCHIVE}")  # Only works in Apple (Xcode only) and MSVC while building static library
+            set_property (TARGET ${TARGET_NAME} APPEND_STRING PROPERTY STATIC_LIBRARY_FLAGS " \"${ARCHIVE}\"")  # Only works in Apple (Xcode only) and MSVC while building static library
         else ()
             list (APPEND ARCHIVES ${ARCHIVE})
         endif ()

+ 1 - 1
cmake_android.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -DANDROID=1
+$(dirname $0)/cmake_generic.sh "$@" -DANDROID=1
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_codeblocks.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -G "CodeBlocks - Unix Makefiles"
+$(dirname $0)/cmake_generic.sh "$@" -G "CodeBlocks - Unix Makefiles"
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_eclipse.sh

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -G "Eclipse CDT4 - Unix Makefiles"
+$(dirname $0)/cmake_generic.sh "$@" -G "Eclipse CDT4 - Unix Makefiles"
 
 # After importing the generated project into Eclipse workspace, set the [Build], [Subprojects], and [Targets] linked resources property as 'Derived'
 # to exclude the derived resources in those folders from being listed in the Open Resource and Search Result list

+ 1 - 1
cmake_emscripten.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -DEMSCRIPTEN=1
+$(dirname $0)/cmake_generic.sh "$@" -DEMSCRIPTEN=1
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_ios.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -G Xcode -DIOS=1
+$(dirname $0)/cmake_generic.sh "$@" -G Xcode -DIOS=1
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_macosx.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -G Xcode
+$(dirname $0)/cmake_generic.sh "$@" -G Xcode
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_mingw.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -DWIN32=1
+$(dirname $0)/cmake_generic.sh "$@" -DWIN32=1
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_ninja.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -G "Ninja"
+$(dirname $0)/cmake_generic.sh "$@" -G "Ninja"
 
 # vi: set ts=4 sw=4 expandtab:

+ 1 - 1
cmake_rpi.sh

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 #
 
-$(dirname $0)/cmake_generic.sh $@ -DRPI=1
+$(dirname $0)/cmake_generic.sh "$@" -DRPI=1
 
 # vi: set ts=4 sw=4 expandtab: