diff options
| author | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-17 10:01:21 +0300 |
|---|---|---|
| committer | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-17 10:01:21 +0300 |
| commit | d1ea5c8333ee3b846fe3b3f6bda50e73d6985190 (patch) | |
| tree | 7bb8e853a296ef8035796cea66dfd25d9c36d042 /src/3rd_party | |
| parent | df2a2ff289e95cc2a2f4332199da920eea5562c9 (diff) | |
| download | sdl_core-d1ea5c8333ee3b846fe3b3f6bda50e73d6985190.tar.gz | |
Fixes after rebasing on develop
Diffstat (limited to 'src/3rd_party')
| -rw-r--r-- | src/3rd_party/FindBSON.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/3rd_party/FindBSON.cmake b/src/3rd_party/FindBSON.cmake index a319687eda..91d53624f1 100644 --- a/src/3rd_party/FindBSON.cmake +++ b/src/3rd_party/FindBSON.cmake @@ -10,11 +10,7 @@ find_library(BSON_LIB find_path(EMHASHMAP_INCLUDE_DIRECTORY emhashmap.h PATHS ${INCLUDE_PATH} -<<<<<<< 5fc2b1752f96e15ebd7433fab1d0d1a602273580 PATH_SUFFIXES emhashmap) -======= - PATH_SUFIXES emhashmap) ->>>>>>> Fix instalation of bson to avoid root access find_library(EMHASHMAP_LIB NAMES emhashmap @@ -23,12 +19,8 @@ find_library(EMHASHMAP_LIB include(FindPackageHandleStandardArgs) -<<<<<<< 5fc2b1752f96e15ebd7433fab1d0d1a602273580 find_package_handle_standard_args(BSON DEFAULT_MSG BSON_INCLUDE_DIRECTORY BSON_LIB EMHASHMAP_INCLUDE_DIRECTORY EMHASHMAP_LIB) -======= -find_package_handle_standard_args(BSON DEFAULT_MSG BSON_INCLUDE_DIRECTORY BSON_INCLUDE_DIRECTORY) ->>>>>>> Fix instalation of bson to avoid root access mark_as_advanced(BSON_INCLUDE_DIRECTORY BSON_LIB) mark_as_advanced(EMHASHMAP_INCLUDE_DIRECTORY EMHASHMAP_LIB) |