Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit 087c4a6

Browse files
author
Lauren Morita
committed
Fixed CMakeLists to be found by plugin
1 parent a4f7cd7 commit 087c4a6

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ configure_file(
3232

3333
install(FILES ${PROJECT_BINARY_DIR}/libmsr-config.cmake DESTINATION
3434
"${CMAKE_INSTALL_PREFIX}/share/cmake/libmsr")
35-
install(EXPORT libmsr-morita DESTINATION
35+
install(EXPORT libmsr-libs DESTINATION
3636
"${CMAKE_INSTALL_PREFIX}/share/cmake/libmsr")
3737

3838
add_subdirectory(src)

libmsr-config.cmake.in

+2-12
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,8 @@ if (NOT libmsr_CONFIG_LOADED)
1111

1212
#Includes needed to use libmsr
1313
set(libmsr_INCLUDE_PATH ${libmsr_INCLUDE_DIR})
14-
set(libmsr_LIB_PATH @{libmsr_LIB_DIR})
15-
#Whether the library was bulit with MPI
16-
set(libmsr_HAVE_MPI @LIBMSR_HAVE_MPI@)
17-
set(libmsr_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@)
18-
set(libmsr_INCLUDE_DIR ${libmsr_INSTALL_PREFIX}/include)
19-
set(libmsr_LIB_DIR ${libmsr_INSTALL_PREFIX}/lib)
14+
set(libmsr_LIB_PATH ${libmsr_LIB_DIR})
2015

21-
#Includes needed to use libmsr
22-
set(libmsr_INCLUDE_PATH ${libmsr_INCLUDE_DIR})
23-
set(libmsr_LIB_PATH @{libmsr_LIB_DIR})
24-
#Whether the library was bulit with MPI
25-
set(libmsr_HAVE_MPI @LIBMSR_HAVE_MPI@)
2616
#Library targets imported from file
27-
include(${libmsr_CMAKE_DIR}/libmsr-libs.cmake)
17+
include(${libmsr_INSTALL_PREFIX}/share/cmake/libmsr/libmsr-libs.cmake)
2818
endif()

src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set (CMAKE_SHARED_LINKER_FLAGS "-lm")
3232
# Install target should install the two library targets above.
3333
#
3434
install(TARGETS msr msr-static DESTINATION
35-
"${CMAKE_INSTALL_PREFIX}/share/cmake/libmsr" EXPORT libmsr-libs)
35+
"${CMAKE_INSTALL_PREFIX}/lib" EXPORT libmsr-libs)
3636

3737
# Headers are in ../include
3838
include_directories(${PROJECT_SOURCE_DIR}/include)

0 commit comments

Comments
 (0)