Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Set VSXU_PLUGIN_LOCATION correctly. #216

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set VSXU_PLUGIN_LOCATION correctly. #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2bf2d
Set VSXU_PLUGIN_LOCATION correctly.
cwilling Mar 20, 2019
97420eb
Generation of vsx_platform.h is not exclusive to Linux
cwilling Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ include (cmake/optimization.txt)
add_definitions(-DVSXU_INSTALL_LIB_DIR="${VSXU_INSTALL_LIB_DIR}")
#add_definitions(-DVSX_VECTOR_TYPE_DOUBLE=1)

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}/ )



################################################################################
Expand Down
2 changes: 1 addition & 1 deletion vsx_platform.h → vsx_platform.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/")
Expand Down