Skip to content

Commit 72ef7f5

Browse files
committed
Update default driver install dir to follow cmake install prefix.
1 parent 926c7a2 commit 72ef7f5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ set(GDL_LIB_DIR "" CACHE PATH "GDL: library directory relative to CMAKE_INSTALL_
167167
if ( GDL_LIB_DIR STREQUAL "" OR NOT GDL_LIB_DIR)
168168
set (GDL_DRV_DIR "${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/drivers") # CACHE PATH "GDL: where the drivers will be installed.")
169169
else()
170-
set (GDL_DRV_DIR "${GDL_LIB_DIR}" ) # CACHE PATH "GDL: where the drivers will be installed.")
170+
set (GDL_DRV_DIR "${CMAKE_INSTALL_PREFIX}/${GDL_LIB_DIR}" ) # CACHE PATH "GDL: where the drivers will be installed.")
171171
endif()
172172
# check for 64-bit OS
173173
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)

config.h.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define EXEC_PREFIX "@CMAKE_INSTALL_PREFIX@"
55
#define GDLDATADIR "@CMAKE_INSTALL_PREFIX@@GDL_DATA_DIR@"
6-
#define GDLLIBDIR "@GDL_LIB_DIR@"
6+
#define GDLLIBDIR "@CMAKE_INSTALL_PREFIX@@GDL_LIB_DIR@"
77
#define GDL_DRV_DIR "@GDL_DRV_DIR@"
88

99
#define _CRT_SECURE_NO_WARNINGS

0 commit comments

Comments
 (0)