]> code.bitgloo.com Git - clyne/entityx.git/commitdiff
add CMAKE_INSTALL_LIBDIR
authorJason Pleau <jason@jpleau.ca>
Sun, 7 Dec 2014 19:30:15 +0000 (14:30 -0500)
committerJason Pleau <jason@jpleau.ca>
Sun, 7 Dec 2014 19:35:32 +0000 (14:35 -0500)
Keeps the default to 'lib', while allowing to use it like so:

-DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu

CMakeLists.txt

index 13c26cc5f557eaba38204f62e811635bf2ea5ff8..77a94a7fa4192595d0bdad7a5204d04f13b3135b 100755 (executable)
@@ -44,6 +44,12 @@ endif()
 #     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors")
 # endif()
 
+# Library installation directory
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR lib)
+endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+
 # C++11 feature checks
 include(CheckCXX11Features.cmake)
 
@@ -161,7 +167,7 @@ if (NOT WINDOWS OR CYGWIN)
 
     install(
         FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx.pc
-        DESTINATION "lib/pkgconfig"
+        DESTINATION "${libdir}/pkgconfig"
         )
 endif()
 
@@ -173,6 +179,6 @@ install(
 
 install(
     TARGETS ${install_libs}
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION "${libdir}"
+    ARCHIVE DESTINATION "${libdir}"
     )