diff options
| author | palmer@945battery-guestB-224.lindenlab.com <palmer@945battery-guestB-224.lindenlab.com> | 2009-07-10 11:09:54 -0700 | 
|---|---|---|
| committer | palmer@945battery-guestB-224.lindenlab.com <palmer@945battery-guestB-224.lindenlab.com> | 2009-07-10 11:09:54 -0700 | 
| commit | 82eb18fce5c3d21a49a299ee5e454cbcc9d6f559 (patch) | |
| tree | 7911756b38b73f68543145f88ab4fada345da7f9 | |
| parent | 9e399d5d3c7348012bcb79557d8a055f96b32e90 (diff) | |
Expanded tabs in cmake files
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 12 | ||||
| -rw-r--r-- | indra/cmake/Linking.cmake | 2 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 16 | 
5 files changed, 20 insertions, 20 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 5717bc620a..0c6ddef50f 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -118,12 +118,12 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)      IF(LL_TEST_VERBOSE)        MESSAGE(STATUS "LL_ADD_PROJECT_UNIT_TESTS ${name} test_cmd  = ${TEST_CMD}")      ENDIF(LL_TEST_VERBOSE) -	 -	IF(WINDOWS) -	  set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}) -	ELSE(WINDOWS) -	  set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:/usr/lib) -	ENDIF(WINDOWS) +     +    IF(WINDOWS) +      set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}) +    ELSE(WINDOWS) +      set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:/usr/lib) +    ENDIF(WINDOWS)      SET(TEST_SCRIPT_CMD         ${CMAKE_COMMAND}  diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index ad52a82b20..4063034837 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -5,7 +5,7 @@ if (NOT STANDALONE)      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)      set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)      set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) -	set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) +    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)    elseif (LINUX)      if (VIEWER)        set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index aaeb4eebc3..cb0f6add21 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -238,10 +238,10 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})  if(LLCOMMON_LINK_SHARED)      add_library (llcommon SHARED ${llcommon_SOURCE_FILES})      add_definitions(-DLL_COMMON_BUILD=1) -	# *FIX:Mani --- -	# llcommon.dll get written to the DLL staging directory. -	# Also this directory is shared with RunBuildTest.cmake, y'know, for the tests. -	set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR}) +    # *FIX:Mani --- +    # llcommon.dll get written to the DLL staging directory. +    # Also this directory is shared with RunBuildTest.cmake, y'know, for the tests. +    set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})  else(LLCOMMON_LINK_SHARED)      add_library (llcommon ${llcommon_SOURCE_FILES})  endif(LLCOMMON_LINK_SHARED) diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 67a171dde6..2c50a9b1cd 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -226,7 +226,7 @@ IF (NOT LINUX AND VIEWER)        # Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05        # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage!        # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py") -	  # llareslistener.cpp +      # llareslistener.cpp        )      LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}") diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d6108ab06e..aece574eed 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1248,11 +1248,11 @@ if (WINDOWS)          COMMENT "Copying message.xml to the runtime folder."          ) -	if(WINDOWS) +    if(WINDOWS)        # Copy Win Libs... -	  # This happens at build time, not config time. We can't glob files in this cmake. -	  # *FIX:Mani Write a sub script to glob the files... -	  add_custom_command( +      # This happens at build time, not config time. We can't glob files in this cmake. +      # *FIX:Mani Write a sub script to glob the files... +      add_custom_command(          TARGET ${VIEWER_BINARY_NAME} PRE_BUILD          COMMAND ${CMAKE_COMMAND}          ARGS @@ -1261,10 +1261,10 @@ if (WINDOWS)            ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}           ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}          COMMENT "Copying staged dlls." -		) -	endif(WINDOWS) -	 -	 +        ) +    endif(WINDOWS) +     +          if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)        add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)  | 
