Skip to content

Commit

Permalink
Remove FORCE from cmake variable modifications
Browse files Browse the repository at this point in the history
This allows user to modify values of these variables, as force will
overwrite values set by user from cmake cache.
  • Loading branch information
orva committed Apr 16, 2014
1 parent b6161ef commit 9a7b79d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IF (USE_OPENMP)
ENDIF (NOT MSVC)
ELSE (USE_OPENMP)
OPTION(USE_OPENMP "Use OpenMP for parallelization" OFF)
SET(USE_OPENMP OFF CACHE BOOL "Use OpenMP for parallelization" FORCE)
SET(USE_OPENMP OFF CACHE BOOL "Use OpenMP for parallelization")
REMOVE_DEFINITIONS(-DUSE_OPENMP)
ENDIF (OPENMP_FOUND)
ENDIF (USE_OPENMP)
Expand All @@ -62,7 +62,7 @@ ENDIF (USE_OPENMP)
# ==============================================================================
# OpenMVG build options
# ==============================================================================
SET(OpenMVG_BUILD_TESTS ON CACHE BOOL "Do not build openMVG tests" FORCE)
SET(OpenMVG_BUILD_TESTS ON CACHE BOOL "Do not build openMVG tests")

# ==============================================================================
# IMAGE IO detection
Expand All @@ -77,8 +77,8 @@ ENDIF (NOT APPLE)
# ==============================================================================
#- glfw
# ==============================================================================
SET(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Do not build the GLFW example programs" FORCE)
SET(GLFW_BUILD_TESTS OFF CACHE BOOL "Do not build the GLFW tests programs" FORCE)
SET(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Do not build the GLFW example programs")
SET(GLFW_BUILD_TESTS OFF CACHE BOOL "Do not build the GLFW tests programs")
ADD_SUBDIRECTORY(dependencies/glfw)
INCLUDE_DIRECTORIES(SYSTEM dependencies/glfw/include)

Expand Down Expand Up @@ -130,7 +130,7 @@ INCLUDE_DIRECTORIES(
# Opencv is not used by openMVG but some samples show how to use openCV
# and openMVG simultaneously
# ==============================================================================
SET(USE_OPENCV OFF CACHE BOOL "Do not build opencv+openMVG samples programs" FORCE)
SET(USE_OPENCV OFF CACHE BOOL "Do not build opencv+openMVG samples programs")
IF (USE_OPENCV)
# In order use openMVG+openCV samples set USE_OPENCV to ON and set the OpenCV_DIR
# to the build directory of openCV. Prefer use static version of openCV libraries.
Expand Down

0 comments on commit 9a7b79d

Please sign in to comment.