Browse Source

Minor clean up on build script.

Yao Wei Tjong 姚伟忠 9 years ago
parent
commit
965e646fb5
2 changed files with 3 additions and 4 deletions
  1. 1 1
      CMake/Modules/Urho3D-CMake-common.cmake
  2. 2 3
      Source/Urho3D/CMakeLists.txt

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

@@ -859,7 +859,7 @@ macro (enable_pch HEADER_PATHNAME)
             get_filename_component (NAME_WE ${HEADER_FILENAME} NAME_WE)
             if (TARGET ${TARGET_NAME})
                 if (VS)
-                    # VS generator is multi-config capable, the exact path is only known during actual build time
+                    # VS is multi-config, the exact path is only known during actual build time based on effective build config
                     set (PCH_PATHNAME "$(IntDir)${PCH_FILENAME}")
                 else ()
                     set (PCH_PATHNAME ${CMAKE_CURRENT_BINARY_DIR}/${PCH_FILENAME})

+ 2 - 3
Source/Urho3D/CMakeLists.txt

@@ -219,7 +219,6 @@ if (MSVC AND URHO3D_LIB_TYPE STREQUAL SHARED)   # MSVC linker does not have forc
     foreach (TARGET ${STATIC_LIBRARY_TARGETS})
         get_target_property (SOURCES ${TARGET} SOURCES)
         get_target_property (INT_DIR ${TARGET} LOCATION)
-        get_target_property (INT_NAME ${TARGET} NAME)
         if (INT_DIR)
             get_filename_component (INT_DIR ${INT_DIR} PATH)
             if (CMAKE_GENERATOR MATCHES 2008)
@@ -234,8 +233,8 @@ if (MSVC AND URHO3D_LIB_TYPE STREQUAL SHARED)   # MSVC linker does not have forc
                         string (REGEX REPLACE \\.c.*$|\\.mm?$|\\.S$|\\.s$ "" NAME "${NAME}")
                         list (APPEND OBJ_FILES ${INT_DIR}/${NAME}.obj)
                     else ()
-                        string (REGEX REPLACE ^.*/ThirdParty/${INT_NAME}/ "" SOURCE "${SOURCE}")
-                        list (APPEND OBJ_FILES ${INT_DIR}/CMakeFiles/${INT_NAME}.dir/${SOURCE}.obj)
+                        string (REGEX REPLACE ^.*/ThirdParty/${TARGET}/ "" SOURCE "${SOURCE}")
+                        list (APPEND OBJ_FILES ${INT_DIR}/CMakeFiles/${TARGET}.dir/${SOURCE}.obj)
                     endif ()
                 elseif (NAME MATCHES \\.o.*$)
                     list (APPEND OBJ_FILES ${SOURCE})