diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:42:23 -0800 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:42:23 -0800 |
| commit | 618179a71722e47115a6b021a1eb2be99e46322f (patch) | |
| tree | 7cb94aef6fe27ed0497790f07f8c190cf1944f92 /indra/llplugin/CMakeLists.txt | |
| parent | bfbcd6d16931819c43eea8e83963c9f86c6892dd (diff) | |
| parent | 5a12a88f7b53bb99a6b302c35d891a8ecee59855 (diff) | |
Merge
Diffstat (limited to 'indra/llplugin/CMakeLists.txt')
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 84667f1b82..129efeb529 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -56,13 +56,13 @@ set(llplugin_HEADER_FILES set_source_files_properties(${llplugin_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -if(NOT WORD_SIZE EQUAL 32) +if(NOT ADDRESS_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + ##add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) -endif(NOT WORD_SIZE EQUAL 32) +endif(NOT ADDRESS_SIZE EQUAL 32) list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) @@ -82,7 +82,7 @@ if (LL_TESTS) set_source_files_properties( llplugincookiestore.cpp PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES}" + LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES};${NGHTTP2_LIBRARIES}" ) LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}") |