| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Define SOCI_LIBDIR only if its not passed via environemnt. In OE we |
| 2 | want to set it per our choice since we use 'lib' for 64bit unless we |
| 3 | are using multilib |
| 4 | |
| 5 | -Khem |
| 6 | |
| 7 | Index: soci-3.2.2/CMakeLists.txt |
| 8 | =================================================================== |
| 9 | --- soci-3.2.2.orig/CMakeLists.txt |
| 10 | +++ soci-3.2.2/CMakeLists.txt |
| 11 | @@ -69,11 +69,12 @@ include(SociDependencies) |
| 12 | ############################################################################### |
| 13 | # Installation |
| 14 | ############################################################################### |
| 15 | - |
| 16 | -if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) |
| 17 | - set(SOCI_LIBDIR "lib") |
| 18 | -else() |
| 19 | - set(SOCI_LIBDIR "lib64") |
| 20 | +if(NOT DEFINED SOCI_LIBDIR) |
| 21 | + if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) |
| 22 | + set(SOCI_LIBDIR "lib") |
| 23 | + else() |
| 24 | + set(SOCI_LIBDIR "lib") |
| 25 | + endif() |
| 26 | endif() |
| 27 | |
| 28 | set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") |