diff options
author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/cmake/Linking.cmake | |
parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
parent | a4966a661213a25b780604084fe169565f62f548 (diff) |
merge up to latest snowstorm integration branch
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) |