Set VSXU_PLUGIN_LOCATION correctly.

Fixes Part 1 of vovoid#214 Signed-off-by: Christoph Willing <[email protected]>
cwilling · Mar 20, 2019 · fc2bf2d · fc2bf2d
1 parent 5404800
commit fc2bf2d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,6 +108,15 @@ include (cmake/optimization.txt)
 add_definitions(-DVSXU_INSTALL_LIB_DIR="${VSXU_INSTALL_LIB_DIR}")
 #add_definitions(-DVSX_VECTOR_TYPE_DOUBLE=1)
 
+IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/vsx_platform.h.in
+                  ${CMAKE_CURRENT_SOURCE_DIR}/vsx_platform.h
+                  @ONLY)
+
+  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/vsx_platform.h
+           DESTINATION ${VSXU_INSTALL_INCLUDE_DIR}/ )
+ENDIF()
+
 
 
 ################################################################################

diff --git a/vsx_platform.h → vsx_platform.h.in b/vsx_platform.h → vsx_platform.h.in
@@ -66,7 +66,7 @@
         #define PLATFORM_NAME                                   "GNU / Linux"
         #define PLATFORM_FAMILY                                 PLATFORM_FAMILY_UNIX
         #define PLATFORM_SHARED_FILES                           vsx_string<>(get_exec_path().c_str()) + "/../share/vsxu/"
-        #define VSXU_PLUGIN_LOCATION                           vsx_string<>(get_exec_path().c_str()) + "/../lib/vsxu/plugins"
+        #define VSXU_PLUGIN_LOCATION                           vsx_string<>(get_exec_path().c_str()) + "/../lib@LIB_SUFFIX@/vsxu/plugins"
         #define PLATFORM_DLL_SUFFIX                             ".so"
         #ifdef PLATFORM_SHARED_FILES_STL
           #define PLATFORM_SHARED_FILES_STLSTRING               get_exec_path() + std::string("/../share/vsxu/")