From 76d7c8ad887ac7b9dfdb495fe26ef8d4d8dfe370 Mon Sep 17 00:00:00 2001 From: flaviojs Date: Thu, 7 Jul 2011 03:21:42 +0000 Subject: * CMake: normalized variable names, added ability to create a package/installer. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14890 54d463be-8e91-2dee-dedb-b68131a5f0ec --- 3rdparty/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to '3rdparty/CMakeLists.txt') diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 0ea359186..3e7cb4cc4 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -8,20 +8,20 @@ # ${name}_SYSTEM_LIBRARIES - libraries of the system version # ${name}_SYSTEM_INCLUDE_DIRS - include directories of the system version # Generates: -# USE_LOCAL_${name} - use the local version of the package (only when local is available) -# USE_${name} - use this package +# WITH_LOCAL_${name} - use the local version of the package (only when local is available) +# WITH_${name} - use this package # ${name}_LIBRARIES - libraries # ${name}_INCLUDE_DIRS - include directories -macro( CONFIGURE_USE_LOCAL_OR_SYSTEM name ) +macro( CONFIGURE_WITH_LOCAL_OR_SYSTEM name ) unset( ${name}_LIBRARIES CACHE ) unset( ${name}_INCLUDE_DIRS CACHE ) if( HAVE_LOCAL_${name} ) - set( USE_LOCAL_${name} ON + set( WITH_LOCAL_${name} ON CACHE BOOL "use local version of ${name}" ) else() - unset( USE_LOCAL_${name} CACHE ) + unset( WITH_LOCAL_${name} CACHE ) endif() - if( USE_LOCAL_${name} ) + if( WITH_LOCAL_${name} ) message( STATUS "Configuring for local ${name}" ) set( ${name}_LIBRARIES ${${name}_LOCAL_LIBRARIES} ) set( ${name}_INCLUDE_DIRS ${${name}_LOCAL_INCLUDE_DIRS} ) @@ -32,11 +32,11 @@ macro( CONFIGURE_USE_LOCAL_OR_SYSTEM name ) set( ${name}_INCLUDE_DIRS ${${name}_SYSTEM_INCLUDE_DIRS} ) message( STATUS "Configuring for system ${name} - done" ) endif() - if( USE_LOCAL_${name} OR HAVE_SYSTEM_${name} ) - set( USE_${name} ON + if( WITH_LOCAL_${name} OR HAVE_SYSTEM_${name} ) + set( WITH_${name} ON CACHE BOOL "use ${name}" ) else() - unset( USE_${name} CACHE ) + unset( WITH_${name} CACHE ) endif() set( ${name}_LIBRARIES ${${name}_LIBRARIES} CACHE PATH "${name} libraries" ) @@ -44,7 +44,7 @@ macro( CONFIGURE_USE_LOCAL_OR_SYSTEM name ) CACHE PATH "${name} include directories" ) mark_as_advanced( ${name}_LIBRARIES ) mark_as_advanced( ${name}_INCLUDE_DIRS ) -endmacro( CONFIGURE_USE_LOCAL_OR_SYSTEM ) +endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM ) add_subdirectory( msinttypes ) -- cgit v1.2.3-70-g09d2