hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CMake configuration error with -DEMBEDDED_LIB=<path to folder> causing the library not being found.

Browse Source
This commit is contained in:
Markus Makela
2014-10-14 19:44:41 +03:00
parent 25bef90508
commit 6de751cd83
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
macros.cmake
View File

@ -127,13 +127,17 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
# Find the embedded mysql library # Find the embedded mysql library
if (DEFINED EMBEDDED_LIB) if (DEFINED EMBEDDED_LIB)
debugmsg("Searching for the embedded library at: ${EMBEDDED_LIB}") if( NOT (IS_DIRECTORY ${EMBEDDED_LIB}) )
if(${CMAKE_VERSION} VERSION_LESS 2.12 ) debugmsg("EMBEDDED_LIB is not a directory: ${EMBEDDED_LIB}")
set(COMP_VAR PATH) if(${CMAKE_VERSION} VERSION_LESS 2.12 )
else() set(COMP_VAR PATH)
set(COMP_VAR DIRECTORY) else()
set(COMP_VAR DIRECTORY)
endif()
get_filename_component(EMBEDDED_LIB ${EMBEDDED_LIB} ${COMP_VAR})
debugmsg("EMBEDDED_LIB directory component: ${EMBEDDED_LIB}")
endif() endif()
get_filename_component(EMBEDDED_LIB ${EMBEDDED_LIB} ${COMP_VAR}) debugmsg("Searching for the embedded library at: ${EMBEDDED_LIB}")
endif() endif()
if(STATIC_EMBEDDED) if(STATIC_EMBEDDED)