Skip to content

Commit de1206b

Browse files
committed
add license
1 parent 97507b0 commit de1206b

File tree

3 files changed

+58
-14
lines changed

3 files changed

+58
-14
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,24 @@ function(resolve_cpr_dependency)
268268
OFF
269269
CACHE BOOL "" FORCE)
270270

271+
# Force curl to use Position Independent Code for shared library compatibility
272+
set(CURL_ENABLE_PIC
273+
ON
274+
CACHE BOOL "" FORCE)
275+
276+
set(CURL_POSITION_INDEPENDENT_CODE
277+
ON
278+
CACHE BOOL "" FORCE)
279+
280+
# Additional curl PIC settings
281+
set(BUILD_CURL_EXE
282+
OFF
283+
CACHE BOOL "" FORCE)
284+
285+
set(CURL_STATIC_PIC
286+
ON
287+
CACHE BOOL "" FORCE)
288+
271289
fetchcontent_declare(cpr
272290
${FC_DECLARE_COMMON_OPTIONS}
273291
GIT_REPOSITORY https://github.com/libcpr/cpr.git
Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
1-
// In file: iceberg/catalog/rest/rest_catalog.cc
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
219

320
#include "iceberg/catalog/rest/rest_catalog.h"
421

522
#include <cpr/cpr.h>
623

7-
namespace iceberg {
8-
namespace catalog {
9-
namespace rest {
24+
namespace iceberg::catalog::rest {
1025

1126
RestCatalog::RestCatalog(const std::string& base_url) : base_url_(std::move(base_url)) {}
1227

@@ -18,6 +33,4 @@ cpr::Response RestCatalog::testCprIntegration() {
1833
return r;
1934
}
2035

21-
} // namespace rest
22-
} // namespace catalog
23-
} // namespace iceberg
36+
} // namespace iceberg::catalog::rest

test/rest_catalog_test.cc

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
// In your test file, e.g., rest_catalog_test.cc
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
219

320
#include "iceberg/catalog/rest/rest_catalog.h"
421

@@ -8,9 +25,7 @@
825
#include "cpr/error.h"
926
#include "cpr/response.h"
1027

11-
namespace iceberg {
12-
namespace catalog {
13-
namespace rest {
28+
namespace iceberg::catalog::rest {
1429

1530
class RestCatalogTest : public ::testing::Test {};
1631

@@ -37,6 +52,4 @@ TEST_F(RestCatalogTest, TestCprIntegration) {
3752
EXPECT_THAT(response.text, ::testing::HasSubstr("\"hello\": \"world\""));
3853
}
3954

40-
} // namespace rest
41-
} // namespace catalog
42-
} // namespace iceberg
55+
} // namespace iceberg::catalog::rest

0 commit comments

Comments
 (0)