From: DRC <dcommander@users.sourceforge.net>
Date: Wed, 6 Apr 2011 06:35:38 +0000 (+0000)
Subject: Attempt to make build work with Visual Studio 2010 (still doesn't work if SIMD or... 
X-Git-Tag: 1.1.1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=926e01ffe1951f219fa7e4618a86355331327d6d;p=libjpeg-turbo

Attempt to make build work with Visual Studio 2010 (still doesn't work if SIMD or Java are enabled-- see bug tracker)


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 74d9b55..f5631bf 100644
--- 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 5be325e..353bb15 100755
--- 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()