Merge branch 'master' into draw_process

CMakeLists.txt

@@ -317,8 +317,10 @@ IF ( COOLPROP_OBJECT_LIBRARY OR COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRA
   ### All options are set, we are building a library ###
   ADD_DEPENDENCIES(${LIB_NAME} generate_headers)
   #
+  
   # Set the bitness
-  IF (!MSVC)
+  IF (NOT MSVC)
+    MESSAGE(STATUS "Setting bitness flag -m${BITNESS}")
     SET_PROPERTY (TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -m${BITNESS}")
     SET_PROPERTY (TARGET ${LIB_NAME} APPEND_STRING PROPERTY LINK_FLAGS " -m${BITNESS}")
   ENDIF()
@@ -349,7 +351,7 @@ IF ( COOLPROP_OBJECT_LIBRARY OR COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRA
 ENDIF()
 
 if (COOLPROP_DEBIAN_PACKAGE)
-    if(!UNIX)
+    if(NOT UNIX)
       message(FATAL_ERROR "COOLPROP_DEBIAN_PACKAGE can only be used on linux host")
     endif()
     list(APPEND APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp")
@@ -394,7 +396,7 @@ if (COOLPROP_VXWORKS_LIBRARY_MODULE OR COOLPROP_VXWORKS_LIBRARY)
 endif()
 
 if (COOLPROP_MATHCAD_MODULE)
-    if(!WIN32)
+    if(NOT WIN32)
       message(FATAL_ERROR "COOLPROP_MATHCAD_MODULE can only be used on windows host")
     endif()
     IF( "${COOLPROP_MATHCAD_ROOT}" STREQUAL "")
@@ -422,7 +424,7 @@ if (COOLPROP_EES_MODULE)
   message(STATUS "Injecting the version COOLPROP_VERSION=${COOLPROP_VERSION}")
   # Put the version into the InnoInstaller setup file
   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/BuildInnoInstaller.iss.in" "${CMAKE_CURRENT_BINARY_DIR}/BuildInnoInstaller.iss")
-  if (!MSVC)
+  if (NOT MSVC)
     set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
   endif()
   add_dependencies (COOLPROP_EES generate_headers)
@@ -676,8 +678,8 @@ if (COOLPROP_JAVA_MODULE)
     set_target_properties(CoolProp PROPERTIES PREFIX "")
   endif()
   
-  if (!MSVC)
-    set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
+  if (NOT MSVC)
+    set_target_properties(CoolProp PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
   endif()
   add_dependencies (${app_name} generate_headers)
   
@@ -787,7 +789,7 @@ if (COOLPROP_PHP_MODULE)
     set_target_properties(CoolProp PROPERTIES PREFIX "")
   endif()
   
-  if (!MSVC)
+  if (NOT MSVC)
     set_target_properties(CoolProp PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
   endif()
   add_dependencies (CoolProp generate_headers)

Web/coolprop/wrappers/Android/index.rst

@@ -26,6 +26,6 @@ Linux & OSX
     # Move into the folder you just created
     mkdir -p CoolProp/build && cd CoolProp/build
     # Construct the makefile using CMake
-    cmake .. -DCOOLPROP_ANDROID_WRAPPER=ON -DNDK_PATH=~/Downloads/android-ndk-r10e
+    cmake .. -DCOOLPROP_ANDROID_MODULE=ON -DNDK_PATH=~/Downloads/android-ndk-r10e
     # Now actually do the build
     cmake --build .

Web/coolprop/wrappers/Python/index.rst

@@ -16,7 +16,7 @@ Using the ``pip`` installation program, you can install the official release fro
 If you dare, you can also try the latest nightly release from :sfnightly:`Python` 
 or get it directly from the development server using::
 
-    pip install --pre --find-links http://www.coolprop.dreamhosters.com/binaries/Python/ -U --force-reinstall CoolProp
+    pip install -vvv --pre --trusted-host www.coolprop.dreamhosters.com --find-links http://www.coolprop.dreamhosters.com/binaries/Python/ -U --force-reinstall CoolProp
 
 
 Manual installation

Web/coolprop/wrappers/SharedLibrary/index.rst

@@ -116,7 +116,7 @@ For 32-bit compilation::
     # Make a build folder
     mkdir build && cd build
     # Generate builder
-    cmake .. -DCOOLPROP_SHARED_LIBRARY=ON
+    cmake .. -DCOOLPROP_SHARED_LIBRARY=ON -DFORCE_BITNESS_32=ON
     # Build
     cmake --build .
 
@@ -128,7 +128,7 @@ For 64-bit compilation::
     cd CoolProp
     # Make a build folder
     mkdir build && cd build
-    # Generate builder
+    # Generate builder (defaults to 64-bit)
     cmake .. -DCOOLPROP_SHARED_LIBRARY=ON
     # Build
     cmake --build .