From 6a9322e67729a8f6e2a2c4fced2b4c0a779af440 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Tue, 22 Jan 2019 10:30:07 -0500 Subject: [PATCH] - force internal GME with any build environment created after this commit. if anyone is using a build environment from before - you will have to make sure to enable the relevant variable - or simply nuke and recreate. this applies only if you have the GME library installed on your system - if you were using the internal before, anyhow, you don't have to make any changes --- CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28ed1482e..fe812f2e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,12 +168,12 @@ find_package( ZLIB ) # if the asmjit author uses our changes then we'll update this. # GME -find_path( GME_INCLUDE_DIR gme/gme.h ) -find_library( GME_LIBRARIES gme ) -mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME - REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR -) +#find_path( GME_INCLUDE_DIR gme/gme.h ) +#find_library( GME_LIBRARIES gme ) +#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) +#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME +# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR +#) if( MSVC ) # Eliminate unreferenced functions and data @@ -274,7 +274,8 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEB_C_FLAGS} -D_DEBUG" ) option(FORCE_INTERNAL_ZLIB "Use internal zlib") option(FORCE_INTERNAL_JPEG "Use internal jpeg") option(FORCE_INTERNAL_BZIP2 "Use internal bzip2") -option(FORCE_INTERNAL_GME "Use internal gme") +option(FORCE_INTERNAL_GME "Use internal gme" ON) +mark_as_advanced( FORCE_INTERNAL_GME ) option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON) mark_as_advanced( FORCE_INTERNAL_ASMJIT )