Skip to content

Commit bcd22fe

Browse files
Fix Cmake package return info
1 parent 8c11589 commit bcd22fe

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ include_directories(BEFORE SYSTEM
312312
)
313313

314314

315-
file(READ "VERSION" CPPINTEROP_VERSION)
315+
file(STRINGS "VERSION" CPPINTEROP_VERSION)
316316
string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*)" CPPINTEROP_VERSION_ONLY "${CPPINTEROP_VERSION}")
317317
set(CPPINTEROP_VERSION_MAJOR "${CMAKE_MATCH_1}")
318318
set(CPPINTEROP_VERSION_MINOR "${CMAKE_MATCH_2}")

cmake/CppInterOp/CppInterOpConfig.cmake.in

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,30 @@ get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}"
1010

1111
if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/include")
1212
set(_include "${CPPINTEROP_INSTALL_PREFIX}/include")
13+
set(_libs "${CPPINTEROP_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}")
1314
else()
1415
set(_include "@CMAKE_CURRENT_SOURCE_DIR@/include")
16+
set(_libs "@CMAKE_CURRENT_SOURCE_DIR@/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}")
1517
endif()
1618

17-
if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/cmake")
18-
set(_cmake "${CPPINTEROP_INSTALL_PREFIX}/cmake")
19+
if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/lib/cmake/CppInterOp")
20+
set(_cmake "${CPPINTEROP_INSTALL_PREFIX}/lib/cmake/CppInterOp")
1921
else()
20-
set(_cmake "@CMAKE_CURRENT_SOURCE_DIR@/cmake")
22+
set(_cmake "@CMAKE_CURRENT_SOURCE_DIR@/cmake/CppInterOp")
2123
endif()
2224

2325
###
2426

2527
set(CPPINTEROP_EXPORTED_TARGETS "clangCppInterOp")
2628
set(CPPINTEROP_CMAKE_DIR "${_cmake}")
2729
set(CPPINTEROP_INCLUDE_DIRS "${_include}")
30+
set(CPPINTEROP_LIBRARIES "${_libs}")
2831

2932
# Provide all our library targets to users.
3033
add_library(clangCppInterOp SHARED IMPORTED)
31-
set_property(TARGET clangCppInterOp PROPERTY IMPORTED_LOCATION "${CPPINTEROP_DIR}/lib/libclangCppInterOp.so")
3234
set_property(TARGET clangCppInterOp PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_include}")
35+
set_property(TARGET clangCppInterOp PROPERTY IMPORTED_LOCATION "${_libs}")
3336

34-
unset(_include)
3537
unset(_cmake)
38+
unset(_include)
39+
unset(_libs)

0 commit comments

Comments
 (0)