Merge pull request #22 from francois-keith/master

Cancel the force default libdir value.
jrl-umi3218 · Sep 17, 2013 · 2cf7d27 · 2cf7d27
2 parents 1a69565 + fba6aef
commit 2cf7d27
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/base.cmake b/base.cmake
@@ -113,10 +113,10 @@ ENDMACRO(_CONCATENATE_ARGUMENTS OUTPUT)
 # file).
 #
 MACRO(SETUP_PROJECT)
+  INCLUDE(cmake/GNUInstallDirs.cmake)
   IF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    SET(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
+    SET(CMAKE_INSTALL_LIBDIR lib)
   ENDIF()
-  INCLUDE(cmake/GNUInstallDirs.cmake)
   SET(CMAKE_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
   SET(CMAKE_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})