Changeset 8283 for code/branches/kicklib2/cmake/PackageConfig.cmake

Timestamp:

Apr 21, 2011, 6:32:28 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7940-7974 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• cmake/PackageConfig.cmake (modified) (2 diffs)

code/branches/kicklib2/cmake/PackageConfig.cmake

@@ -31 +31 @@
 #        But you can specify that the code only runs on 3.1 and higher
 #        or 4.0 and higher (so both 3.1 and 4.0 will work).
-SET(ALLOWED_MINIMUM_VERSIONS 3.1 4.0 5.0)
+IF(MSVC)
+  SET(ALLOWED_MINIMUM_VERSIONS 4.3 5.1 6.0)
+ELSE()
+  SET(ALLOWED_MINIMUM_VERSIONS 4.1 5.2)
+ENDIF()
 
 IF(NOT EXISTS ${DEPENDENCY_PACKAGE_DIR}/version.txt)
@@ -84 +88 @@
 SET(ENV{DXSDK_DIR}             ${DEP_INCLUDE_DIR}/directx)
 #SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
-SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
+SET(ENV{LUA5.1_DIR}            ${DEP_INCLUDE_DIR}/lua)
 SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR}/libogg)
 SET(ENV{VORBISDIR}             ${DEP_INCLUDE_DIR}/libvorbis)