diff options
Diffstat (limited to 'cmake/SisoLibDir.cmake')
| -rw-r--r-- | cmake/SisoLibDir.cmake | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/cmake/SisoLibDir.cmake b/cmake/SisoLibDir.cmake index 371735e..594b2f9 100644 --- a/cmake/SisoLibDir.cmake +++ b/cmake/SisoLibDir.cmake @@ -46,7 +46,14 @@ MACRO (SISO_LIB_DIR BASE_DIR LIB_DIRS) ELSEIF (CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008 Win64") SET(TMP_MSVC 9) SET(TMP_MSVC_64 1) - ELSEIF (CMAKE_GENERATOR STREQUAL "NMake Makefiles" OR CMAKE_GENERATOR STREQUAL "MinGW Makefiles") + ELSEIF (CMAKE_GENERATOR STREQUAL "Visual Studio 10") + SET(TMP_MSVC 10) + SET(TMP_MSVC_64 0) + ELSEIF (CMAKE_GENERATOR STREQUAL "Visual Studio 10 Win64") + SET(TMP_MSVC 10) + SET(TMP_MSVC_64 1) + ELSEIF (CMAKE_GENERATOR STREQUAL "NMake Makefiles" OR CMAKE_GENERATOR STREQUAL "MinGW Makefiles" + OR CMAKE_GENERATOR STREQUAL "NMake Makefiles JOM") SET(TMP_MSVC_64 ${CMAKE_CL_64}) IF (MSVC_VERSION EQUAL 1400) SET(TMP_MSVC 8) @@ -59,18 +66,14 @@ MACRO (SISO_LIB_DIR BASE_DIR LIB_DIRS) ELSE (MSVC_VERSION EQUAL 1400) SET(TMP_MSVC 6) ENDIF (MSVC_VERSION EQUAL 1400) + ELSE (CMAKE_GENERATOR STREQUAL "Visual Studio 6") + MESSAGE(FATAL_ERROR "Compiler not detected in SisoLibDir.cmake") ENDIF (CMAKE_GENERATOR STREQUAL "Visual Studio 6") SET(TMP_DIRS "") - IF (TMP_MSVC GREATER 9) - LIST(APPEND TMP_DIRS "visualc2010") - ENDIF (TMP_MSVC GREATER 9) - IF (TMP_MSVC GREATER 8) - LIST(APPEND TMP_DIRS "visualc2008") - ENDIF (TMP_MSVC GREATER 8) IF (TMP_MSVC GREATER 7) - LIST(APPEND TMP_DIRS "visualc2005") + LIST(APPEND TMP_DIRS "visualc") ENDIF (TMP_MSVC GREATER 7) IF (TMP_MSVC GREATER 5 AND NOT TMP_MSVC_64) LIST(APPEND TMP_DIRS "visualc") @@ -79,7 +82,7 @@ MACRO (SISO_LIB_DIR BASE_DIR LIB_DIRS) IF (${ARGC} EQUAL 3) LIST(GET TMP_DIRS 0 TMPSTR) IF (TMP_MSVC_64) - SET(TMPSTR "${TMPSTR}_amd64") + SET(TMPSTR "${TMPSTR}") ENDIF (TMP_MSVC_64) set(${ARGV2} ${TMPSTR}) ENDIF (${ARGC} EQUAL 3) @@ -87,7 +90,7 @@ MACRO (SISO_LIB_DIR BASE_DIR LIB_DIRS) IF (NOT BASE_DIR STREQUAL "" AND NOT BASE_DIR STREQUAL "/lib") FOREACH (TMP_ITEM ${TMP_DIRS}) IF (TMP_MSVC_64) - LIST(APPEND ${LIB_DIRS} "${BASE_DIR}/${TMP_ITEM}_amd64") + LIST(APPEND ${LIB_DIRS} "${BASE_DIR}/${TMP_ITEM}") ELSE (TMP_MSVC_64) LIST(APPEND ${LIB_DIRS} "${BASE_DIR}/${TMP_ITEM}") ENDIF (TMP_MSVC_64) @@ -99,7 +102,7 @@ MACRO (SISO_LIB_DIR BASE_DIR LIB_DIRS) LIST(APPEND ${LIB_DIRS} ${BASE_DIR}) ENDIF (NOT BASE_DIR STREQUAL "" AND NOT BASE_DIR STREQUAL "/lib") IF (${ARGC} EQUAL 3) - set(${ARGV2} "") + set(${ARGV2} "interface") ENDIF (${ARGC} EQUAL 3) ENDIF (WIN32) IF (${LIB_DIRS}) |