Skip to content

Commit bc3d91e

Browse files
authored
Merge pull request #20 from JCSDA/bugfix/PackageConfig
bugfix on PackageConfig.
2 parents 51c4130 + cb330d4 commit bc3d91e

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

cmake/PackageConfig.cmake.in

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,28 @@ set(@PROJECT_NAME@_SHARED_LIBRARIES)
2222
set(@PROJECT_NAME@_STATIC_LIBRARIES)
2323
set(@PROJECT_NAME@_SHARED_FOUND 0)
2424
set(@PROJECT_NAME@_STATIC_FOUND 0)
25-
if(@BUILD_STATIC_LIBS@)
25+
if(@GSW_BUILD_STATIC_LIBS@)
2626
set(@PROJECT_NAME@_STATIC_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@_static)
2727
set(@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@_static)
2828
set(@PROJECT_NAME@_STATIC_FOUND 1)
29-
if(@BUILD_SHARED_LIBS@)
29+
if(@GSW_BUILD_SHARED_LIBS@)
3030
set(@PROJECT_NAME@_SHARED_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@_shared)
3131
set(@PROJECT_NAME@_SHARED_FOUND 1)
3232
endif()
33-
elseif(@BUILD_SHARED_LIBS@)
33+
elseif(@GSW_BUILD_SHARED_LIBS@)
3434
#Only shared libraries are build. Set @PROJECT_NAME@_LIBRARIES to point to shared target.
3535
set(@PROJECT_NAME@_SHARED_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@_shared)
3636
set(@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@_shared)
3737
set(@PROJECT_NAME@_SHARED_FOUND 1)
3838
else()
3939
set(@PROJECT_NAME@_FOUND 0)
40-
set(@PROJECT_NAME@_NOT_FOUND_MESSAGE "Neither BUILD_SHARED_LIBS nor BUILD_STATIC_LIBS was set. Unable to find any libararies.")
40+
set(@PROJECT_NAME@_NOT_FOUND_MESSAGE "Neither GSW_BUILD_SHARED_LIBS nor GSW_BUILD_STATIC_LIBS was set. Unable to find any libraries.")
4141
endif()
4242

43-
get_target_property(@PROJECT_NAME@_BUILD_TYPES ${@PROJECT_NAME@_LIBRARIES} IMPORTED_CONFIGURATIONS)
43+
if(@GSW_BUILD_STATIC_LIBS@)
44+
get_target_property(@PROJECT_NAME@_BUILD_TYPES @PROJECT_NAME@::@PROJECT_NAME@_static IMPORTED_CONFIGURATIONS)
45+
elseif(@GSW_BUILD_SHARED_LIBS@)
46+
get_target_property(@PROJECT_NAME@_BUILD_TYPES @PROJECT_NAME@::@PROJECT_NAME@_shared IMPORTED_CONFIGURATIONS)
47+
endif()
4448

4549
check_required_components("@PROJECT_NAME@")

0 commit comments

Comments
 (0)