remove SB_CMAKE_CMD. use proper cmake var for install_project

CMake/External_curl.cmake

@@ -34,7 +34,7 @@ else()
         INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
         PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CURL_SB_SRC} ${CURL_SB_BUILD_DIR}
         CONFIGURE_COMMAND ""
-        BUILD_COMMAND ${SB_MAKE_CMD} /f ${CURL_SB_BUILD_DIR}/winbuild/Makefile.vc mode=dll WITH_ZLIB=dll WITH_DEVEL=${CMAKE_INSTALL_PREFIX}
+        BUILD_COMMAND nmake /f ${CURL_SB_BUILD_DIR}/winbuild/Makefile.vc mode=dll WITH_ZLIB=dll WITH_DEVEL=${CMAKE_INSTALL_PREFIX}
         INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir ${CURL_SB_BUILD_DIR}/builds/ ${CMAKE_COMMAND} -E copy_directory libcurl-vc-x86-release-dll-zlib-dll-ipv6-sspi-winssl ${CMAKE_INSTALL_PREFIX} 
     )
     

CMake/External_jpeg.cmake

@@ -31,7 +31,7 @@ else()
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${JPEG_SB_SRC} ${JPEG_SB_BUILD_DIR}
       CONFIGURE_COMMAND ""
-      BUILD_COMMAND ${SB_MAKE_CMD} /f ${JPEG_SB_BUILD_DIR}/makefile.vc nodebug=1
+      BUILD_COMMAND nmake /f ${JPEG_SB_BUILD_DIR}/makefile.vc nodebug=1
       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
       ${CMAKE_BINARY_DIR}/${proj}/_install
     )
@@ -53,8 +53,7 @@ else()
       CMAKE_CACHE_ARGS
         -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
         -DCMAKE_BUILD_TYPE:STRING=Release
-        -DJPEG_INCLUDE_DIR:STRING=${JPEG_SB_BUILD_DIR}
-        -DJPEG_LIB_DIR:STRING=${JPEG_SB_BUILD_DIR}
+        -DJPEG_BUILD_DIR:STRING=${JPEG_SB_BUILD_DIR}
       DEPENDS ${proj}_build
       CMAKE_COMMAND
     )

CMake/External_libtiff.cmake

@@ -39,7 +39,7 @@ else()
       DEPENDS ${${proj}_DEPENDENCIES}
       PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${TIFF_SB_BUILD_DIR}/nmake.opt ${TIFF_SB_SRC}
       CONFIGURE_COMMAND ""
-      BUILD_COMMAND ${SB_MAKE_CMD} /f ${TIFF_SB_SRC}/Makefile.vc
+      BUILD_COMMAND nmake /f ${TIFF_SB_SRC}/Makefile.vc
       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
       ${CMAKE_BINARY_DIR}/${proj}/_install
     )
@@ -53,8 +53,7 @@ else()
     CMAKE_CACHE_ARGS
       -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
       -DCMAKE_BUILD_TYPE:STRING=Release
-      -DTIFF_INCLUDE_DIR:STRING=${TIFF_SB_SRC}/libtiff
-      -DTIFF_LIB_DIR:STRING=${TIFF_SB_SRC}/libtiff
+      -DTIFF_BUILD_DIR:STRING=${TIFF_SB_SRC}/libtiff
       DEPENDS ${proj}_build
       CMAKE_COMMAND
     )

CMake/External_proj4.cmake

@@ -24,7 +24,7 @@ else()
       BINARY_DIR ${PROJ_SB_BUILD_DIR}
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       CONFIGURE_COMMAND ""
-      BUILD_COMMAND ${SB_MAKE_CMD} /f ${PROJ_SB_SRC}/makefile.vc
+      BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc
       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
       ${CMAKE_BINARY_DIR}/${proj}/_install
     )
@@ -38,8 +38,7 @@ else()
     CMAKE_CACHE_ARGS
       -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
       -DCMAKE_BUILD_TYPE:STRING=Release
-      -DPROJ_INCLUDE_DIR:STRING=${PROJ_SB_SRC}/src
-      -DPROJ_LIB_DIR:STRING=${PROJ_SB_BUILD_DIR}/src
+      -DPROJ4_BUILD_DIR:STRING=${PROJ_SB_SRC}/src
       DEPENDS ${proj}_build
       CMAKE_COMMAND
     )

CMakeLists.txt

@@ -11,12 +11,12 @@ set(CMAKE_MODULE_PATH
 include(ExternalProject)
 include(CTest)
 
-if(MSVC)
-set(SB_CMAKE_COMMAND ${CMAKE_COMMAND})
-set(SB_MAKE_CMD "nmake")
+if(WIN32)
+  if(MSVC)
+    set(SB_CMAKE_COMMAND ${CMAKE_COMMAND})
+  endif()      
 else(UNIX)
-set(SB_CMAKE_COMMAND env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib  ${CMAKE_COMMAND})
-set(SB_MAKE_CMD "make")
+  set(SB_CMAKE_COMMAND env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib  ${CMAKE_COMMAND})
 endif()
 # Call external projects
 

patches/JPEG/CMakeLists.txt

@@ -4,14 +4,14 @@ project(jpeg_install)
 
 
 file(GLOB ${PROJECT_NAME}_HEADERS 
-           "${JPEG_INCLUDE_DIR}/jconfig.h" 
-           "${JPEG_INCLUDE_DIR}/jerror.h"
-           "${JPEG_INCLUDE_DIR}/jmorecfg.h"
-           "${JPEG_INCLUDE_DIR}/jpegint.h"
-           "${JPEG_INCLUDE_DIR}/jpeglib.h" )
+           "${JPEG_BUILD_DIR}/jconfig.h" 
+           "${JPEG_BUILD_DIR}/jerror.h"
+           "${JPEG_BUILD_DIR}/jmorecfg.h"
+           "${JPEG_BUILD_DIR}/jpegint.h"
+           "${JPEG_BUILD_DIR}/jpeglib.h" )
 
 #libjpeg is static
-file(GLOB ${PROJECT_NAME}_LIBS "${JPEG_LIB_DIR}/*.lib" )
+file(GLOB ${PROJECT_NAME}_LIBS "${JPEG_BUILD_DIR}/*.lib" )
 #file(GLOB ${PROJECT_NAME}_DLLS "${JPEG_INCLUDE_DIR}/jpeg*.dll" )
 
 

patches/PROJ/CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8.3)
 
 project(proj_install)
 
-file(GLOB ${PROJECT_NAME}_HEADERS "${PROJ_INCLUDE_DIR}/projects.h" "${PROJ_INCLUDE_DIR}/proj_api.h" "${PROJ_INCLUDE_DIR}/org_proj4_Projections.h" )
-file(GLOB ${PROJECT_NAME}_LIBS "${PROJ_LIB_DIR}/*.lib" )
-file(GLOB ${PROJECT_NAME}_DLLS "${PROJ_LIB_DIR}/*.dll" )
+file(GLOB ${PROJECT_NAME}_HEADERS "${PROJ4_BUILD_DIR}/projects.h" "${PROJ4_BUILD_DIR}/proj_api.h" "${PROJ_INCLUDE_DIR}/org_proj4_Projections.h" )
+file(GLOB ${PROJECT_NAME}_LIBS "${PROJ4_BUILD_DIR}/*.lib" )
+file(GLOB ${PROJECT_NAME}_DLLS "${PROJ4_BUILD_DIR}/*.dll" )
 
 foreach(${PROJECT_NAME}_HEADER ${${PROJECT_NAME}_HEADERS})
 install(FILES ${${PROJECT_NAME}_HEADER}

patches/TIFF/CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8.3)
 
 project(tiff_install)
 
-file(GLOB ${PROJECT_NAME}_HEADERS "${TIFF_INCLUDE_DIR}/tif*.h" )
-file(GLOB ${PROJECT_NAME}_LIBS "${TIFF_LIB_DIR}/libtiff*.lib" )
-file(GLOB ${PROJECT_NAME}_DLLS "${TIFF_LIB_DIR}/libtiff*.dll" )
+file(GLOB ${PROJECT_NAME}_HEADERS "${TIFF_BUILD_DIR}/tif*.h" )
+file(GLOB ${PROJECT_NAME}_LIBS "${TIFF_BUILD_DIR}/libtiff*.lib" )
+file(GLOB ${PROJECT_NAME}_DLLS "${TIFF_BUILD_DIR}/libtiff*.dll" )
 
 foreach(${PROJECT_NAME}_HEADER ${${PROJECT_NAME}_HEADERS})
 install(FILES ${${PROJECT_NAME}_HEADER}