diff options
| author | Allen Winter <winter@kde.org> | 2008-04-14 19:51:24 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2008-04-14 19:51:24 +0000 |
| commit | 479eff683c78e06073afcbe008f35ba7eb348068 (patch) | |
| tree | 8458bf6bd0d071b6468432eae52689a455258867 | |
| parent | 5ef94db0b23f14ab98795d6fc950ac3356eab0c0 (diff) | |
| download | extra-cmake-modules-479eff683c78e06073afcbe008f35ba7eb348068.tar.gz extra-cmake-modules-479eff683c78e06073afcbe008f35ba7eb348068.tar.bz2 | |
remove CACHE STRING, which can cause problems.
per Brad King.
svn path=/trunk/KDE/kdelibs/; revision=797050
| -rw-r--r-- | modules/FindFreetype.cmake | 2 | ||||
| -rw-r--r-- | modules/FindOpenEXR.cmake | 4 | ||||
| -rw-r--r-- | modules/FindPCRE.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 6fd1bb13..6c22bb1b 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -45,7 +45,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) endforeach(value) endif(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output) - set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE STRING "The libraries for freetype" ) + set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ) mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index cd443c0a..ac58b345 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -68,9 +68,9 @@ ENDIF (NOT WIN32) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) if (OPENEXR_ILMTHREAD_LIBRARY) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) else (OPENEXR_ILMTHREAD_LIBRARY) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ) endif (OPENEXR_ILMTHREAD_LIBRARY) if (WIN32) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index e2f29bdd..56f015a8 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -34,6 +34,6 @@ FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${_PCRELinkDir}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY ) -set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") +set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY}) MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY) |