diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/cmake/Linking.cmake | |
parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/cmake/Linking.cmake')
-rwxr-xr-x[-rw-r--r--] | indra/cmake/Linking.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index c3e3a80fd0..b9c9e531fc 100644..100755 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -1,5 +1,8 @@ # -*- cmake -*- +if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) +set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") + include(Variables) set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib) @@ -69,3 +72,5 @@ else (WINDOWS) endif (WINDOWS) mark_as_advanced(DL_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES) + +endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) |