From e09c895dceb005aa45937016445f4c846d2f3b44 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 29 Sep 2015 17:42:28 -0600 Subject: [PATCH 1/5] Fix pip install command for nightly; closes #821 --- Web/coolprop/wrappers/Python/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/coolprop/wrappers/Python/index.rst b/Web/coolprop/wrappers/Python/index.rst index 611e8543..3a2047bf 100644 --- a/Web/coolprop/wrappers/Python/index.rst +++ b/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 From 79fa5178b33bd4d15bb23681296801d2ec34cd28 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 29 Sep 2015 17:46:29 -0600 Subject: [PATCH 2/5] Fixed docs; see #820 --- Web/coolprop/wrappers/Android/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/coolprop/wrappers/Android/index.rst b/Web/coolprop/wrappers/Android/index.rst index 93f8274e..e310a94f 100644 --- a/Web/coolprop/wrappers/Android/index.rst +++ b/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 . \ No newline at end of file From 7c99e356e4587ea9a022901d19c1283a7a5c921a Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 29 Sep 2015 20:08:59 -0600 Subject: [PATCH 3/5] Fix all ! and replace with NOT in CMakeLists.txt; see #791 --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa119c3f..539312c3 100644 --- a/CMakeLists.txt +++ b/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,7 +678,7 @@ if (COOLPROP_JAVA_MODULE) set_target_properties(CoolProp PROPERTIES PREFIX "") endif() - if (!MSVC) + if (NOT MSVC) set_target_properties(COOLPROP_EES 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) From 148c63397be7ca5adaba7c1bb3d83009ddeb4977 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 29 Sep 2015 20:09:46 -0600 Subject: [PATCH 4/5] Fix docs for 32-bit shared library setting of bitness flag --- Web/coolprop/wrappers/SharedLibrary/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/coolprop/wrappers/SharedLibrary/index.rst b/Web/coolprop/wrappers/SharedLibrary/index.rst index 0622ddd9..224535d2 100644 --- a/Web/coolprop/wrappers/SharedLibrary/index.rst +++ b/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 . From 20354290dcaeb6fd4cd51c647c5a739f9eca7b97 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 29 Sep 2015 21:15:53 -0600 Subject: [PATCH 5/5] Fix broken Java builds --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 539312c3..8ede7c92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -679,7 +679,7 @@ if (COOLPROP_JAVA_MODULE) endif() if (NOT MSVC) - set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64") + set_target_properties(CoolProp PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64") endif() add_dependencies (${app_name} generate_headers)