diff --git a/CMakeLists.txt b/CMakeLists.txt index 9672f9e7..ccc6403e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,9 @@ PROJECT(libsword CXX C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) SET(SWORD_VERSION 1.8.900) +# Quiet warning from CURLConfig.cmake +cmake_policy(SET CMP0012 NEW) + # Make sure it's an out-of-stream build IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) MESSAGE(FATAL_ERROR "Please invoke CMake from a different directory than the source.") diff --git a/cmake/options.cmake b/cmake/options.cmake index b20370eb..8d81964f 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -26,7 +26,8 @@ endmacro(_SET_FANCY) IF(APPLE) SET(SWORD_INSTALL_DIR "/opt/local") ELSEIF(MSVC) - SET(SWORD_INSTALL_DIR "C:\\Program Files (x86)\\libsword\\") + #TODO: This wrong as it expect to 32bit build, but there could be 64bit build + SET(SWORD_INSTALL_DIR "C:/Program Files (x86)/libsword") ELSE(APPLE) SET(SWORD_INSTALL_DIR "/usr/local") ENDIF(APPLE)