Skip to content
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

replaced MSVC variable with WIN32 #1773

Merged
merged 2 commits into from Oct 29, 2015
Merged

replaced MSVC variable with WIN32 #1773

merged 2 commits into from Oct 29, 2015

Conversation

ericLemanissier
Copy link
Contributor

solves #1756

@@ -52,7 +52,7 @@ set(HPX_LIBRARY_VERSION "${HPX_VERSION}")
set(HPX_SOVERSION ${HPX_MAJOR_VERSION})
set(HPX_PACKAGE_NAME HPX)

if(MSVC)
if(WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only needed when generating solutions for visual studio. Is this the case?

@ericLemanissier
Copy link
Contributor Author

I just realized the tests are not compiled in this configuration. I am currently trying with pseudo targets and pseudo dependencies ON, because it seems mandatory to compile all the tests. Please don't merge the current version of the pull request

@hkaiser
Copy link
Member

hkaiser commented Sep 29, 2015

In order to run the tests you'll have to explicitly request building them:

make -jN tests

@ericLemanissier
Copy link
Contributor Author

Yes, but the "tests" target does not exist if HPX_WITH_PSEUDO_DEPENDENCIES is OFF
The error was the following:

CMake Warning (dev) at CMakeLists.txt:1344 (add_custom_command):
  Policy CMP0040 is not set: The target in the TARGET signature of
  add_custom_command() must exist.  Run "cmake --help-policy CMP0040" for
  policy details.  Use the cmake_policy command to set the policy and
  suppress this warning.

  The target name "tests" is unknown in this context.

I tried to run make from the folder tests\performance, test\regressions and tests\units, but i got only 'Nothing to be done for tests/XXXX/all', because these target did not have any dependency

@hkaiser
Copy link
Member

hkaiser commented Sep 29, 2015

You're right, we disable pseudo dependencies for MSVC by default. This has to be fixed in the cmake files (see https://github.com/STEllAR-GROUP/hpx/blob/master/CMakeLists.txt#L154).

@ericLemanissier
Copy link
Contributor Author

yes, I already made this change (not pushed yet), but I have now some errors in tests cmakefiles. I have no more time today,i will correct it tomorrow

@ericLemanissier
Copy link
Contributor Author

just for information, I am compiling with the following options:
-DHPX_WITH_TOOLS=ON
-DHPX_WITH_PSEUDO_DEPENDENCIES=ON
-DCMAKE_CXX_FLAGS="-DBOOST_NO_AUTO_PTR -DBOOST_SYSTEM_NO_DEPRECATED -D_WIN32_WINNT=0x0601"

with Boost version: 1.58.0
and mingw-w64\x86_64-5.1.0-posix-seh-rt_v4-rev0

replaced MSVC variable with WIN32
@hkaiser
Copy link
Member

hkaiser commented Oct 20, 2015

@ericLemanissier What's the state of this PR? Can we go ahead and consider merging it now?

@ericLemanissier
Copy link
Contributor Author

except for #1802 it seems to be ok in the configuration I tested ( i686-5.1.0-posix-dwarf-rt_v4-rev0 and x86_64-5.1.0-posix-seh-rt_v4-rev with boost 1.58 and hwloc 1.11.0). According to me It can be merged

@hkaiser
Copy link
Member

hkaiser commented Oct 20, 2015

Thanks! LGTM.

@hkaiser hkaiser merged commit eb573ee into STEllAR-GROUP:master Oct 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants