Browse Source

Merge pull request #13436 from ghalliday/issue23635

HPCC-23635 Do not apply visibility flags to libyaml

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 năm trước cách đây
mục cha
commit
30f0342908
5 tập tin đã thay đổi với 24 bổ sung4 xóa
  1. 1 1
      .gitmodules
  2. 1 0
      system/CMakeLists.txt
  3. 1 3
      system/jlib/CMakeLists.txt
  4. 21 0
      system/yaml/CMakeLists.txt
  5. 0 0
      system/yaml/libyaml

+ 1 - 1
.gitmodules

@@ -47,5 +47,5 @@
 	path = system/aeron
 	url = https://github.com/hpcc-systems/aeron.git
 [submodule "system/libyaml"]
-	path = system/libyaml
+	path = system/yaml/libyaml
 	url = https://github.com/hpcc-systems/libyaml.git

+ 1 - 0
system/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 HPCC_ADD_SUBDIRECTORY (include)
 HPCC_ADD_SUBDIRECTORY (jhtree)
+HPCC_ADD_SUBDIRECTORY (yaml)
 HPCC_ADD_SUBDIRECTORY (jlib)
 
 if (NOT JLIB_ONLY)

+ 1 - 3
system/jlib/CMakeLists.txt

@@ -30,8 +30,6 @@ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
 CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT) 
 endif ()
 
-add_subdirectory(${HPCC_SOURCE_DIR}/system/libyaml ${CMAKE_BINARY_DIR}/system/libyaml)
-
 if(NOT TARGET lzma)
   add_subdirectory(${HPCC_SOURCE_DIR}/system/lzma ${CMAKE_BINARY_DIR}/system/lzma)
 endif(NOT TARGET lzma)
@@ -195,7 +193,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/system/lz4_sm/lz4/lib
          ${HPCC_SOURCE_DIR}/system/globalid
          ${HPCC_SOURCE_DIR}/system/security/cryptohelper
-         ${HPCC_SOURCE_DIR}/system/libyaml/include
+         ${HPCC_SOURCE_DIR}/system/yaml/libyaml/include
          ${CMAKE_CURRENT_BINARY_DIR}  # for generated jelog.h file 
          ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss

+ 21 - 0
system/yaml/CMakeLists.txt

@@ -0,0 +1,21 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2020 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+
+project( yaml_include)
+
+remove_definitions(-fvisibility=hidden)
+
+add_subdirectory(${HPCC_SOURCE_DIR}/system/yaml/libyaml ${CMAKE_BINARY_DIR}/system/libyaml)

system/libyaml → system/yaml/libyaml