Attempt to make build work with Visual Studio 2010 (still doesn't work if SIMD or...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@573 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74d9b5536b7d0354c7def34d76684748ca5a28c5..f5631bff547e83153b99d38f5dc3ca3075680d8d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,7 +320,7 @@ if(64BIT)
 endif()
 
 if(MSVC_IDE)
-  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=$(OutDir)\\")
+  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${CMAKE_CFG_INTDIR}\\")
 else()
   set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=")
 endif()

diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt
index 5be325e9d4284ac0b8dad9567fbd5ab5562dfa18..353bb155f070cf3ca1a3153dce5bfb99c091e9c6 100755 (executable)
--- a/simd/CMakeLists.txt
+++ b/simd/CMakeLists.txt
@@ -36,7 +36,7 @@ else()
 endif()
 
 if(MSVC_IDE)
-  set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")
+  set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
 else()
   set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})
 endif()