* 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

4 files changed, 21 insertions, 13 deletions

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 )
diff --git a/3rdparty/mysql/CMakeLists.txt b/3rdparty/mysql/CMakeLists.txt
index 902037f07..3f792281c 100644
--- a/3rdparty/mysql/CMakeLists.txt
+++ b/3rdparty/mysql/CMakeLists.txt
@@ -24,6 +24,7 @@ if( MYSQL_LOCAL_LIBRARIES AND MYSQL_LOCAL_INCLUDE_DIRS )
 	endif()
 	set( HAVE_LOCAL_MYSQL ON
 		CACHE BOOL "mysql client is available as a local copy")
+	mark_as_advanced( HAVE_LOCAL_MYSQL )
 else()
 	foreach( _VAR MYSQL_LOCAL_LIBRARIES MYSQL_LOCAL_INCLUDE_DIRS )
 		if( NOT "${_VAR}" )
@@ -70,6 +71,9 @@ mark_as_advanced( MYSQL_SYSTEM_INCLUDE_DIRS )
 if( MYSQL_SYSTEM_LIBRARIES AND MYSQL_SYSTEM_INCLUDE_DIRS )
 	set( HAVE_SYSTEM_MYSQL ON
 		CACHE BOOL "mysql client is available on the system" )
+	mark_as_advanced( HAVE_SYSTEM_MYSQL )
+else()
+	unset( HAVE_SYSTEM_MYSQL CACHE )
 endif()
 message( STATUS "Detecting system MYSQL - done" )
 
@@ -77,4 +81,4 @@ message( STATUS "Detecting system MYSQL - done" )
 #
 # configure
 #
-CONFIGURE_USE_LOCAL_OR_SYSTEM( MYSQL )
+CONFIGURE_WITH_LOCAL_OR_SYSTEM( MYSQL )
diff --git a/3rdparty/pcre/CMakeLists.txt b/3rdparty/pcre/CMakeLists.txt
index ab1c83b6d..70448d40e 100644
--- a/3rdparty/pcre/CMakeLists.txt
+++ b/3rdparty/pcre/CMakeLists.txt
@@ -21,6 +21,7 @@ if( PCRE_LOCAL_LIBRARIES AND PCRE_LOCAL_INCLUDE_DIRS )
 	message( STATUS "Found PCRE: ${PCRE_LOCAL_LIBRARIES} (found version ${PCRE_MAJOR}.${PCRE_MINOR})" )
 	set( HAVE_LOCAL_PCRE ON
 		CACHE BOOL "pcre is available as a local copy" )
+	mark_as_advanced( HAVE_LOCAL_PCRE )
 else()
 	foreach( _VAR PCRE_LOCAL_LIBRARIES PCRE_LOCAL_INCLUDE_DIRS )
 		if( NOT "${_VAR}" )
@@ -52,6 +53,7 @@ mark_as_advanced( PCRE_SYSTEM_INCLUDE_DIRS )
 if( PCRE_SYSTEM_LIBRARIES AND PCRE_SYSTEM_INCLUDE_DIRS )
 	set( HAVE_SYSTEM_PCRE ON
 		CACHE BOOL "pcre is available on the system" )
+	mark_as_advanced( HAVE_SYSTEM_PCRE )
 else()
 	unset( HAVE_SYSTEM_PCRE CACHE )
 endif()
@@ -61,4 +63,4 @@ message( STATUS "Detecting system PCRE - done" )
 #
 # configure
 #
-CONFIGURE_USE_LOCAL_OR_SYSTEM( PCRE )
+CONFIGURE_WITH_LOCAL_OR_SYSTEM( PCRE )
diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt
index 3bb4304e7..4002908f5 100644
--- a/3rdparty/zlib/CMakeLists.txt
+++ b/3rdparty/zlib/CMakeLists.txt
@@ -20,6 +20,7 @@ if( ZLIB_LOCAL_LIBRARIES AND ZLIB_LOCAL_INCLUDE_DIRS )
 	message( STATUS "Found local ZLIB: ${ZLIB_LOCAL_LIBRARIES} (found version ${ZLIB_VERSION})" )
 	set( HAVE_LOCAL_ZLIB ON
 		CACHE BOOL "zlib is available as a local copy" )
+	mark_as_advanced( HAVE_LOCAL_ZLIB )
 else()
 	foreach( _VAR ZLIB_LOCAL_LIBRARIES ZLIB_LOCAL_INCLUDE_DIRS )
 		if( NOT "${_VAR}" )
@@ -50,6 +51,7 @@ mark_as_advanced( ZLIB_SYSTEM_INCLUDE_DIRS )
 if( ZLIB_SYSTEM_LIBRARIES AND ZLIB_SYSTEM_INCLUDE_DIRS )
 	set( HAVE_SYSTEM_ZLIB ON
 		CACHE BOOL "zlib is available on the system" )
+	mark_as_advanced( HAVE_SYSTEM_ZLIB )
 else()
 	unset( HAVE_SYSTEM_ZLIB CACHE )
 endif()
@@ -59,4 +61,4 @@ message( STATUS "Detecting system ZLIB - done" )
 #
 # configure
 #
-CONFIGURE_USE_LOCAL_OR_SYSTEM( ZLIB )
+CONFIGURE_WITH_LOCAL_OR_SYSTEM( ZLIB )