Skip to content

cmake: fix CMake sample/tests/ptests include dir #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmake: fix CMake sample/tests/ptests include dir #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
file(STRINGS "VERSION" version)
project(alibabacloud-oss-cpp-sdk VERSION ${version})
message(STATUS "Project version: ${PROJECT_VERSION}")
set(SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
set(OSS_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
set(TARGET_OUTPUT_NAME_PREFIX "alibabacloud-oss-" CACHE STRING "The target's output name prefix")

#Options
Expand Down
2 changes: 1 addition & 1 deletion ptest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ file(GLOB ptest_src "src/*")
add_executable(${PROJECT_NAME} ${ptest_src})

target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_SOURCE_DIR}/sdk/include)
PRIVATE ${OSS_SDK_ROOT}/sdk/include)

target_link_libraries(${PROJECT_NAME} cpp-sdk${STATIC_LIB_SUFFIX})
target_link_libraries(${PROJECT_NAME} ${CRYPTO_LIBS})
Expand Down
4 changes: 2 additions & 2 deletions sample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ add_executable(${PROJECT_NAME}
${sample_encryption_src})

target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_SOURCE_DIR}/sdk/include)
PRIVATE ${OSS_SDK_ROOT}/sdk/include)

target_link_libraries(${PROJECT_NAME} cpp-sdk)
target_link_libraries(${PROJECT_NAME} ${CRYPTO_LIBS})
Expand All @@ -59,4 +59,4 @@ install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
)
56 changes: 28 additions & 28 deletions sdk/include/alibabacloud/oss/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
/*
* Copyright 2009-2017 Alibaba Cloud All rights reserved.
*
* 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.
*/
#pragma once
// version = (major << 16) + (minor << 8) + patch
#define ALIBABACLOUD_OSS_VERSION ((1 << 16) + (9 << 8) + 0)
#define ALIBABACLOUD_OSS_VERSION_STR "1.9.0"
// auto generated by cmake option
/* #undef OSS_DISABLE_BUCKET */
/* #undef OSS_DISABLE_LIVECHANNEL */
/* #undef OSS_DISABLE_RESUAMABLE */
/* #undef OSS_DISABLE_ENCRYPTION */
/*
* Copyright 2009-2017 Alibaba Cloud All rights reserved.
*
* 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.
*/

#pragma once

// version = (major << 16) + (minor << 8) + patch
#define ALIBABACLOUD_OSS_VERSION ((1 << 16) + (9 << 8) + 0)

#define ALIBABACLOUD_OSS_VERSION_STR "1.9.0"

// auto generated by cmake option
/* #undef OSS_DISABLE_BUCKET */
/* #undef OSS_DISABLE_LIVECHANNEL */
/* #undef OSS_DISABLE_RESUAMABLE */
/* #undef OSS_DISABLE_ENCRYPTION */
8 changes: 4 additions & 4 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ add_executable(${PROJECT_NAME}
${test_encryption_src})

target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_SOURCE_DIR}/sdk/include
PRIVATE ${CMAKE_SOURCE_DIR}/sdk/
PRIVATE ${CMAKE_SOURCE_DIR}/test/external)
PRIVATE ${OSS_SDK_ROOT}/sdk/include
PRIVATE ${OSS_SDK_ROOT}/sdk/
PRIVATE ${OSS_SDK_ROOT}/test/external)

if (${TARGET_OS} STREQUAL "WINDOWS")
target_include_directories(${PROJECT_NAME}
Expand All @@ -65,4 +65,4 @@ target_compile_options(${PROJECT_NAME}
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(${PROJECT_NAME}
PRIVATE "-Wno-invalid-source-encoding")
endif()
endif()