Browse Source

Fix a regression issue caused by external project target renaming.
Close #1137.

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
5a97c68a49

+ 2 - 2
CMake/Modules/Urho3D-CMake-common.cmake

@@ -973,7 +973,7 @@ macro (setup_target)
     endif ()
 
     # Workaround CMake/Xcode generator bug where it always appends '/build' path element to SYMROOT attribute and as such the items in Products are always rendered as red as if they are not yet built
-    if (XCODE AND NOT CMAKE_PROJECT_NAME MATCHES ^ExternalProject-)
+    if (XCODE AND NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-)
         file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build)
         get_target_property (LOCATION ${TARGET_NAME} LOCATION)
         string (REGEX REPLACE "^.*\\$\\(CONFIGURATION\\)" $(CONFIGURATION) SYMLINK ${LOCATION})
@@ -1633,7 +1633,7 @@ macro (install_header_files)
         if (NOT ARG_DESTINATION)
             message (FATAL_ERROR "Couldn't setup install command because the install destination is not specified.")
         endif ()
-        if (NOT ARG_BUILD_TREE_ONLY AND NOT CMAKE_PROJECT_NAME MATCHES ^ExternalProject-)
+        if (NOT ARG_BUILD_TREE_ONLY AND NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-)
             install (${INSTALL_TYPE} ${INSTALL_SOURCES} DESTINATION ${ARG_DESTINATION} ${INSTALL_MATCHING})
         endif ()
 

+ 0 - 3
Source/ThirdParty/LuaJIT/CMakeLists.txt

@@ -234,9 +234,6 @@ if (NOT HOST_SYS STREQUAL TARGET_SYS)
 endif ()
 
 # Makefile: Files and pathnames
-if (NOT BAKED_CMAKE_SOURCE_DIR)
-    set (BAKED_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-endif ()
 set (DASM_ARCH ${TARGET_LJARCH})
 
 # Below regex is a workaround for "LJ_ARCH_BITS (.*?)\\n" as CMake does not understand non-greedy quantifier

+ 1 - 1
Source/ThirdParty/LuaJIT/src/host/CMakeLists.txt

@@ -20,7 +20,7 @@
 # THE SOFTWARE.
 #
 
-if (CMAKE_PROJECT_NAME STREQUAL ExternalProject-tolua++)
+if (CMAKE_PROJECT_NAME STREQUAL Urho3D-ExternalProject-tolua++)
     # Do not install the buildvm host tool from tolua++ external project because it is built for targetting host system itself
     # We only want to keep the buildvm host tool which is built for cross-compiling target (the one built from internal LuaJIT CMake-target)
     set (DEST_RUNTIME_DIR "")   # In this particular case, it is not equivalent to unset() the variable