make CMAKE_INSTALL_PREFIX available on Windows as well

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e57803cb267d264b68ec2a9bb20b5cf5b4dbc7..13d95dba5bbf2656f6d084a66d12d5ad31e8ba14 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,12 +20,10 @@ endif()
 \r
 \r
 # it _must_ go before PROJECT(OpenCV) in order to work\r
-if (NOT CMAKE_INSTALL_PREFIX)\r
-    if(WIN32)\r
-        set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE INTERNAL "" FORCE)\r
-    elseif()\r
-        set(CMAKE_INSTALL_PREFIX "/usr" CACHE INTERNAL "" FORCE)\r
-    endif()\r
+if(WIN32)\r
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")\r
+else()\r
+    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")\r
 endif()\r
 \r
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")\r
@@ -59,10 +57,6 @@ if(MSVC)
     set(CMAKE_USE_RELATIVE_PATHS ON CACHE INTERNAL "" FORCE)\r
 endif()\r
 \r
-#set(CMAKE_C_COMPILER "/opt/BullseyeCoverage/bin/gcc")\r
-#set(CMAKE_CXX_COMPILER "/opt/BullseyeCoverage/bin/g++")\r
-#set(CMAKE_CXX_COMPILER_INIT "/opt/BullseyeCoverage/bin/gcc")\r
-\r
 \r
 # --------------------------------------------------------------\r
 # Indicate CMake 2.7 and above that we don't want to mix relative\r