New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmake fixes #1062

Merged
merged 10 commits into from Feb 23, 2015

Conversation

Projects
None yet
2 participants
@aashish24
Contributor

aashish24 commented Feb 21, 2015

Fixed #825 and various other minor issues

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Feb 21, 2015

@doutriaux1 @dlonie please approve.

endif()
else()
message(WARNING "Unable to extract remote for '${_branch}' using default VisTrails branch")

This comment has been minimized.

@doutriaux1

doutriaux1 Feb 21, 2015

Member

Why remove that one it was kind of nice to know it couldn't get the desired branch

@@ -17,18 +17,6 @@ set(ENV{FLIBS} "")
set(ENV{LD_X11} "") # for xgks
set(ENV{PYTHONPATH} @PYTHONPATH@)

if (DEFINED ENV{UVCDAT_ANONYMOUS_LOG})

This comment has been minimized.

@doutriaux1

doutriaux1 Feb 21, 2015

Member

That block is needed I think it will hang if you don't have a .uvcdat directory

@@ -1,7 +1,6 @@
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import mpi4py" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)

if ( NOT ${res} EQUAL 0 )
message("[INFO] Could not system mpi4py, ${PYTHON_EXECUTABLE}")

This comment has been minimized.

@doutriaux1

doutriaux1 Feb 21, 2015

Member

Why remove these warmings?

@@ -36,8 +37,21 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)

if (DEFINED ENV{UVCDAT_ANONYMOUS_LOG})

This comment has been minimized.

@doutriaux1

doutriaux1 Feb 21, 2015

Member

Oh ok I see you put it back here

@@ -146,7 +160,7 @@ if(NOT GIT_PROTOCOL)
endif()

set(GIT_PROTOCOL ${temp_git_protocol} CACHE STRING "Choose protocol to be used by git" FORCE)
set_property(CACHE GIT_PROTOCOL PROPERTY STRINGS "git://" "http://")
set_property(CACHE GIT_PROTOCOL PROPERTY STRINGS "git://" "http://" "https://")

This comment has been minimized.

@doutriaux1
@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Feb 23, 2015

@aashish24 ok work for me so I'm going to merge. I don't see the options for taking ParaView out unless specified -DCDAT_BUILD_PARAVIEW=ON, so that we can do a -DCDAT_BUILD_MODE=ALL that does not build ParaView

doutriaux1 added a commit that referenced this pull request Feb 23, 2015

@doutriaux1 doutriaux1 merged commit 151cd8b into master Feb 23, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@doutriaux1 doutriaux1 deleted the cmake_fixes branch Feb 23, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment