Skip to content

Commit cea798d

Browse files
authored
Merge pull request #48 from awslabs/FB-ConfigFix
Remove all platform checks against config generation
2 parents 96733f0 + df51378 commit cea798d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ SET(PYTHON_CMD "python")
6969
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
7070

7171
include(resolve_platform)
72+
include(CMakePackageConfigHelpers)
7273

7374
# use response files to prevent command-line-too-big errors for large libraries like iam
7475
SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)

aws-cpp-sdk-core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ else()
399399
endif()
400400
endif()
401401

402-
if(PLATFORM_LINUX AND SIMPLE_INSTALL)
402+
if(SIMPLE_INSTALL)
403403
configure_file("${CMAKE_SOURCE_DIR}/toolchains/pkg-config.pc.in" "${PROJECT_NAME}.pc" @ONLY)
404404

405405
if(BUILD_SHARED_LIBS)

cmake/utilities.cmake

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,15 @@ endfunction(enable_unity_build)
3434

3535
macro(setup_install)
3636
if(SIMPLE_INSTALL)
37-
if(PLATFORM_LINUX)
38-
configure_file("${CMAKE_SOURCE_DIR}/toolchains/pkg-config.pc.in" "${PROJECT_NAME}.pc" @ONLY)
39-
endif()
37+
configure_file("${CMAKE_SOURCE_DIR}/toolchains/pkg-config.pc.in" "${PROJECT_NAME}.pc" @ONLY)
4038

4139
install( TARGETS ${PROJECT_NAME}
4240
EXPORT "${PROJECT_NAME}-targets"
4341
ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}
4442
LIBRARY DESTINATION ${LIBRARY_DIRECTORY}
4543
RUNTIME DESTINATION ${BINARY_DIRECTORY} )
4644

47-
if (PLATFORM_LINUX AND BUILD_SHARED_LIBS)
45+
if (BUILD_SHARED_LIBS)
4846
install(
4947
FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
5048
DESTINATION ${LIBRARY_DIRECTORY}/pkgconfig)
@@ -66,7 +64,7 @@ macro(do_packaging)
6664
install (FILES nuget/${PROJECT_NAME}.autopkg DESTINATION nuget)
6765
endif()
6866

69-
if(PLATFORM_LINUX AND SIMPLE_INSTALL)
67+
if(SIMPLE_INSTALL)
7068
write_basic_package_version_file(
7169
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
7270
VERSION ${PROJECT_VERSION}

0 commit comments

Comments
 (0)