File opae-fix-cmake-paths.patch of Package opae

Overview Repositories Revisions Requests Users Attributes Meta

File opae-fix-cmake-paths.patch of Package opae (Revision 26a18dfc16789e17617bf545d06f3017)

Currently displaying revision 26a18dfc16789e17617bf545d06f3017 , Show latest

commit 06103695f4667ccc2fd33422fc90af3ab2b78ac5
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date:   Wed Sep 6 09:49:10 2017 +0200

opae fix cmake paths
    
    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>

diff --git ase/api/CMakeLists.txt ase/api/CMakeLists.txt
index e436333cd470..356c1e62b638 100644
--- ase/api/CMakeLists.txt
+++ ase/api/CMakeLists.txt
@@ -63,5 +63,5 @@ set_target_properties(opae-c-ase PROPERTIES
   SOVERSION ${INTEL_FPGA_API_VER_MAJOR})
 
 install(TARGETS opae-c-ase
-  LIBRARY DESTINATION lib
+  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
   COMPONENT opaecase)
diff --git libopae/CMakeLists.txt libopae/CMakeLists.txt
index e09e1d43cf20..4cfc5b81b2fa 100644
--- libopae/CMakeLists.txt
+++ libopae/CMakeLists.txt
@@ -105,7 +105,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Release")
 
 # Binary install locations
 install(TARGETS opae-c
-  LIBRARY DESTINATION lib
+  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
   COMPONENT opaeclib)
 
 
diff --git safe_string/CMakeLists.txt safe_string/CMakeLists.txt
index 6c55669e83e5..49c8ccc22da9 100644
--- safe_string/CMakeLists.txt
+++ safe_string/CMakeLists.txt
@@ -114,5 +114,5 @@ target_compile_definitions(safestr PRIVATE PIC=1)
 target_compile_options(safestr PRIVATE -O3)
 
 install(TARGETS safestr
-        ARCHIVE DESTINATION lib
+        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
         COMPONENT safestrlib)
diff --git samples/CMakeLists.txt samples/CMakeLists.txt
index 8b4506ba7d32..3738a1e56ab8 100644
--- samples/CMakeLists.txt
+++ samples/CMakeLists.txt
@@ -40,5 +40,5 @@ target_link_libraries(hello_events json-c uuid ${CMAKE_THREAD_LIBS_INIT} opae-c)
 set(SAMPLES_SRC hello_fpga.c hello_events.c)
 
 install(FILES ${SAMPLES_SRC}
-        DESTINATION src/opae
+        DESTINATION ${SHARE_INSTALL_PREFIX}/opae
         COMPONENT samplesrc)
diff --git tools/c++utils/CMakeLists.txt tools/c++utils/CMakeLists.txt
index 914cb7e7137d..2c42b16d1871 100644
--- tools/c++utils/CMakeLists.txt
+++ tools/c++utils/CMakeLists.txt
@@ -54,5 +54,5 @@ set_target_properties(opae-c++-utils PROPERTIES
 target_link_libraries(opae-c++-utils pthread ${CJSON_LIBRARY})
 
 install(TARGETS opae-c++-utils
-        LIBRARY DESTINATION lib
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         COMPONENT opaecxxutils)
diff --git tools/fpgadiag/CMakeLists.txt tools/fpgadiag/CMakeLists.txt
index 6c0e845bedb2..812a78eec677 100644
--- tools/fpgadiag/CMakeLists.txt
+++ tools/fpgadiag/CMakeLists.txt
@@ -108,7 +108,7 @@ install(PROGRAMS fpgadiag
     DESTINATION bin
     COMPONENT toolfpgadiag)
 install(TARGETS opae-c++-nlb
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     COMPONENT opaecxxnlb)
 install(TARGETS ${binaries}
     RUNTIME DESTINATION bin
diff --git tools/hssi/CMakeLists.txt tools/hssi/CMakeLists.txt
index 4cae847be7e4..b6084ccac1a3 100644
--- tools/hssi/CMakeLists.txt
+++ tools/hssi/CMakeLists.txt
@@ -79,7 +79,7 @@ set_install_rpath(hssi_config)
 target_link_libraries(hssi_config hssi-io pthread)
 
 install(TARGETS hssi-io
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     COMPONENT hssiiolib)
 install(TARGETS hssi_config hssi_loopback
     RUNTIME DESTINATION bin
diff --git tools/libopae++/CMakeLists.txt tools/libopae++/CMakeLists.txt
index 287d078cc0fb..2c708308e76b 100644
--- tools/libopae++/CMakeLists.txt
+++ tools/libopae++/CMakeLists.txt
@@ -62,5 +62,5 @@ set_target_properties(opae-c++ PROPERTIES
   SOVERSION ${INTEL_FPGA_API_VER_MAJOR})
 
 install(TARGETS opae-c++
-        LIBRARY DESTINATION lib
+		LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         COMPONENT opaecxxlib)

Places

File opae-fix-cmake-paths.patch of Package opae (Revision 26a18dfc16789e17617bf545d06f3017)

Places