build: pr787 - CMAKE_INSTALL_PREFIX default
authordavidhubbard <davidhubbard@users.noreply.github.com>
Thu, 21 Jul 2016 22:11:59 +0000 (15:11 -0700)
committerMark Young <marky@lunarg.com>
Thu, 4 Aug 2016 19:02:08 +0000 (13:02 -0600)
CMAKE_INSTALL_PREFIX default is /usr/local on unix

In order to build with a custom CMAKE_INSTALL_PREFIX, the line
set (CMAKE_INSTALL_PREFIX "") must be removed.

CMake set will overwrite anything specified on the command
line with cmake -DCMAKE_INSTALL_PREFIX.

Change-Id: I3bc905b4ad8fb08917e500e4987eb0277ba74a40

CMakeLists.txt

index 263002e..8df90e1 100644 (file)
@@ -57,8 +57,6 @@ if(NOT WIN32)
     include(FindPkgConfig)
 endif()
 
-set (CMAKE_INSTALL_PREFIX "")
-
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
     set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp")
@@ -262,7 +260,7 @@ if(NOT WIN32)
     include(GNUInstallDirs)
     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_SYSCONFDIR}")
     add_definitions(-DDATADIR="${CMAKE_INSTALL_DATADIR}")
-    if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+    if (CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
     elseif (CMAKE_INSTALL_PREFIX STREQUAL "")
     else()
         add_definitions(-DLOCALPREFIX="${CMAKE_INSTALL_PREFIX}")