summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2008-04-07 18:59:44 +0200
committerDennis Kasprzyk <onestone@opencompositing.org>2008-04-07 18:59:44 +0200
commit42609d4abaf6f1492186e707b6c7660558502b96 (patch)
tree2d53d6ebd979c33e88eb527d6ecb8f4c41cf848c
parent30e4e0dd844b2d5272cc2a82e57eac0d36483133 (diff)
downloadmakefile-42609d4abaf6f1492186e707b6c7660558502b96.tar.gz
makefile-42609d4abaf6f1492186e707b6c7660558502b96.tar.bz2
LIBSUFFIX -> LIB_SUFFIX and CF_ prefix for our variables.
-rw-r--r--cmake/CompizFusion.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/CompizFusion.cmake b/cmake/CompizFusion.cmake
index e4f30e9..c5027eb 100644
--- a/cmake/CompizFusion.cmake
+++ b/cmake/CompizFusion.cmake
@@ -88,9 +88,9 @@ macro (_prepare_directories)
if ("${CF_INSTALL_TYPE}" STREQUAL "package")
set (PLUGIN_BUILDTYPE global)
set (PLUGIN_PREFIX ${CMAKE_INSTALL_PREFIX})
- set (PLUGIN_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIBSUFFIX}/compiz)
+ set (PLUGIN_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/compiz)
set (PLUGIN_INCDIR ${CMAKE_INSTALL_PREFIX}/include/compiz)
- set (PLUGIN_PKGDIR ${CMAKE_INSTALL_PREFIX}/lib${LIBSUFFIX}/pkgconfig)
+ set (PLUGIN_PKGDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
set (PLUGIN_XMLDIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
set (PLUGIN_IMAGEDIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
set (PLUGIN_DATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
@@ -176,7 +176,7 @@ macro (_check_plugin_pkg_deps _prefix)
list (APPEND ${_prefix}_INCDIRS "${_${_name}_INCLUDE_DIRS}")
else (_${_name}_FOUND)
set (${_prefix}_HAS_PKG_DEPS FALSE)
- _cf_set (${_prefix}_MISSING_DEPS "${${_prefix}_MISSING_DEPS} ${_val}")
+ _cf_set (CF_${_prefix}_MISSING_DEPS "${CF_${_prefix}_MISSING_DEPS} ${_val}")
set(__pkg_config_checked__${_name} 0 CACHE INTERNAL "" FORCE)
endif (_${_name}_FOUND)
endforeach (_val)
@@ -207,7 +207,7 @@ macro (_check_plugin_plugin_deps _prefix)
list (APPEND ${_prefix}_INCDIRS "${_${_name}_INCLUDE_DIRS}")
else (_${_name}_FOUND)
set (${_prefix}_HAS_PLUGIN_DEPS FALSE)
- _cf_set (${_prefix}_MISSING_DEPS "${${_prefix}_MISSING_DEPS} compiz-${_val}")
+ _cf_set (CF_${_prefix}_MISSING_DEPS "${CF_${_prefix}_MISSING_DEPS} compiz-${_val}")
set(__pkg_config_checked__${_name} 0 CACHE INTERNAL "" FORCE)
endif (_${_name}_FOUND)
endif (_plugin_dep_${_val})
@@ -377,7 +377,7 @@ macro (compiz_fusion_plugin plugin)
set (${_PLUGIN}_HAS_PLUGIN_DEPS)
# check dependencies
- _cf_unset (${_PLUGIN}_MISSING_DEPS)
+ _cf_unset (CF_${_PLUGIN}_MISSING_DEPS)
_check_plugin_pkg_deps (${_PLUGIN} ${${_PLUGIN}_PKGDEPS})
_check_plugin_plugin_deps (${_PLUGIN} ${${_PLUGIN}_PLUGINDEPS})
@@ -535,7 +535,7 @@ macro (compiz_fusion_plugin plugin)
else (COMPIZ_FOUND AND ${_PLUGIN}_HAS_PKG_DEPS AND ${_PLUGIN}_HAS_PLUGIN_DEPS)
message (STATUS "[WARNING] One or more dependencies for compiz plugin ${plugin} not found. Skipping plugin.")
- message (STATUS "Missing dependencies :${${_PLUGIN}_MISSING_DEPS}")
+ message (STATUS "Missing dependencies :${CF_${_PLUGIN}_MISSING_DEPS}")
_cf_set (CF_${_PLUGIN}_BUILD FALSE)
endif (COMPIZ_FOUND AND ${_PLUGIN}_HAS_PKG_DEPS AND ${_PLUGIN}_HAS_PLUGIN_DEPS)
endmacro (compiz_fusion_plugin)