Cmake simplification and various other minor changes #1204

sithhell · 2014-07-28T13:34:45Z

This pull request represents a rework of our build system. In order to support more platforms and fix issues related to the build system (#1201, #1160, #1138, #1072, #970, #934, #847, #720, #503, #459, #345 and #209) this step was necessary. Unfortunately, it included some breaking changes.

Features:

Worked on documentation. Preview: http://sithhell.github.io/docs/html/
Multiconfiguration builds (i.e. changing the build type in VS directly) should now be supported
Removed all "clever" link/compile options to make HPX compatible to other compiled libraries. Flags
can easily be changed by setting the CMAKE_CXX_FLAGS option and friends.
Removed almost all platform specific checks (modulo some sanity checks and checks to make HPX
built out of the box on linux and windows). Platform specific stuff should now belong into toolchain files.
Some renaming of HPX cmake variables: http://sithhell.github.io/docs/html/hpx/manual/build_system/building_hpx/cmake_variables.html
Support for static linking
Removing of unnecessary compile/link flags for external projects
Reworked HPX external cmake support to conform to latest CMake state of the art practice: http://www.cmake.org/cmake/help/git-master/manual/cmake-packages.7.html#creating-packages
HPX_NO_INSTALL is no longer necessary
Moved non "plugin-able" libraries directly to lib/ instead of lib/hpx

In addition some minor fixes to the source code has been done to fix minor issues.

…PX_STATIC_LINKING is defined

…_934 Conflicts: cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in src/components/static_components.list tools/create_static_module_data.cpp

Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake

…PX_STATIC_LINKING is defined Conflicts: hpx/runtime/components/server/runtime_support.hpp

Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in src/components/static_components.list tools/create_static_module_data.cpp

Conflicts: cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in

…_934 Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake hpx/runtime/components/server/runtime_support.hpp

Conflicts: cmake/FindHPX_OpenMP.cmake cmake/HPX_AddConfigTest.cmake src/util/ini.cpp

Conflicts: CMakeLists.txt hpx/components/security/server/certificate_authority_base.hpp hpx/components/security/server/root_certificate_authority.hpp hpx/components/security/server/subordinate_certificate_authority.hpp hpx/runtime/parcelset/decode_parcels.hpp hpx/runtime/parcelset/encode_parcels.hpp hpx/runtime/threads/policies/local_queue_scheduler.hpp

Conflicts: CMakeLists.txt

hkaiser · 2014-08-15T00:10:36Z

I'm now seeing:

4>d:\devel\hpx\src\util\runtime_configuration.cpp(197): error C2146: syntax error : missing ';' before identifier 'hpx'
4>d:\devel\hpx\src\util\runtime_configuration.cpp(197): error C2882: 'hpx' : illegal use of namespace identifier in expression
4>d:\devel\hpx\src\util\runtime_configuration.cpp(202): error C2146: syntax error : missing ';' before identifier 'hpx'
4>d:\devel\hpx\src\util\runtime_configuration.cpp(202): error C2882: 'hpx' : illegal use of namespace identifier in expression
4>d:\devel\hpx\src\util\runtime_configuration.cpp(207): error C2146: syntax error : missing ';' before identifier 'hpx'
4>d:\devel\hpx\src\util\runtime_configuration.cpp(207): error C2882: 'hpx' : illegal use of namespace identifier in expression
4>d:\devel\hpx\src\util\runtime_configuration.cpp(212): error C2146: syntax error : missing ';' before identifier 'hpx'
4>d:\devel\hpx\src\util\runtime_configuration.cpp(212): error C2882: 'hpx' : illegal use of namespace identifier in expression

while compiling the core HPX library. I believe this is caused by the pp constant HPX_COMPONENT_NAME=hpx passed on the compiler command line. Should that be HPX_COMPONENT_NAME="hpx" instead? Hmm, but then the default (https://github.com/STEllAR-GROUP/hpx/blob/cmake_simplification/hpx/config.hpp#L428) would be wrong as well... IOW, I'm not sure what's broken.

hkaiser · 2014-08-15T00:16:19Z

I just checked - the current cmake system (master branch) puts an additional HPX_DLL_STRING="hpxd.dll" (for the debug build, it should go without the 'd' for all other configurations) onto the compiler command line which is why it works with what we have right now. Not sure why this was removed.

Conflicts: CMakeLists.txt examples/mini_ghost/CMakeLists.txt hpx/util/register_locks.hpp tests/unit/parallel/count.cpp

sithhell · 2014-08-25T14:14:13Z

I removed HPX_DLL_STRING completely as it is only used in src/util/runtime_configuration.cpp. So it is not needed to be defined on the command line or in hpx/config.hpp.

hkaiser · 2014-08-25T15:10:53Z

Sure, it just didn't work with out it. I think @biddisco has committed a fix, though.

sithhell · 2014-08-25T18:01:36Z

True. That fixed it. I further streamlined the use of that macro.

Conflicts: src/runtime/parcelset/policies/mpi/connection_handler_mpi.cpp

sithhell · 2014-09-03T09:10:11Z

The branch seems to have stabelized. Merging.

Cmake simplification and various other minor changes

hkaiser and others added 30 commits March 13, 2014 13:56

More work on static linking

1750aa1

Fixing generated projects

c188fd3

Improving static module list handling

fdf8496

More work on static linking

e679396

Fixing generated projects

c8901f9

Improving static module list handling

2ee53bd

Rebasing on master branch, removing dynamic loading all together if H…

b835c1e

…PX_STATIC_LINKING is defined

Merge branch 'fixing_934' of github.com:STEllAR-GROUP/hpx into fixing…

1ab1353

…_934 Conflicts: cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in src/components/static_components.list tools/create_static_module_data.cpp

work on cmake simplification (intermediate commit)

aade817

More work on static linking

afe8949

Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake

Fixing generated projects

a853991

Improving static module list handling

9ee7f2b

Rebasing on master branch, removing dynamic loading all together if H…

3cda192

…PX_STATIC_LINKING is defined Conflicts: hpx/runtime/components/server/runtime_support.hpp

More work on static linking

0b70524

Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in src/components/static_components.list tools/create_static_module_data.cpp

Fixing generated projects

77c17d4

Conflicts: cmake/HPX_StaticComponentList.cmake cmake/templates/static_component_data.hpp.in

Improving static module list handling

200c98b

re-basing from master

1c10d15

Merge branch 'fixing_934' of github.com:STEllAR-GROUP/hpx into fixing…

8c196bd

…_934 Conflicts: CMakeLists.txt cmake/HPX_Compile.cmake hpx/runtime/components/server/runtime_support.hpp

more work on cmake refactoring

7c08bd6

More cmake based work

a781cd1

Merge branch 'master' into cmake_simplification

600967a

Conflicts: cmake/FindHPX_OpenMP.cmake cmake/HPX_AddConfigTest.cmake src/util/ini.cpp

More cmake stuff and various fixes ...

5e52656

More cmake work

f745ce2

Almost ...

b1855f6

Merge branch 'master' into cmake_simplification

d7b39ad

Conflicts: CMakeLists.txt

Minor fix to MPI parcelport

3255733

Minor cleanup in parcelports

7279e6e

More cmake work

d0f007c

Package file generation finished

57459cb

biddisco and others added 5 commits August 22, 2014 11:00

use HPX_WITH_CXX_LAMBDAS not HAVE

f06c450

Fix a problem with HPX_DLL_STRING for string literals

8d6b6fa

Further fine-tuning HPX_DLL_STRING usage

7009224

Merge branch 'master' into cmake_simplification

0c9f647

Conflicts: CMakeLists.txt examples/mini_ghost/CMakeLists.txt hpx/util/register_locks.hpp tests/unit/parallel/count.cpp

More CMake and macro definition finetuning

bcefe2d

Thomas Heller and others added 12 commits August 28, 2014 11:57

shuffling cmake script lines ... make static linking work again

4bd5da9

Update HPX_AddConfigTest.cmake

e0a8b76

Merge branch 'master' into cmake_simplification

fc98b1b

Conflicts: src/runtime/parcelset/policies/mpi/connection_handler_mpi.cpp

Adding parent thread to the HPX thread listing

899aa4e

Making query_counters.cpp compile with non C++11 stdlibs

fc78eeb

Disabling execution of our config tests

db4a722

Making static linking work when using components

553cf67

Improving the toolchain support

5d0c81c

Fixing message output

a7b2c07

Fixing message output

b175af3

Minor fix to external builds

104899e

Improving documentation

6c67ac0

sithhell closed this Sep 3, 2014

sithhell reopened this Sep 3, 2014

sithhell added a commit that referenced this pull request Sep 3, 2014

Merge pull request #1204 from STEllAR-GROUP/cmake_simplification

ecdb034

Cmake simplification and various other minor changes

sithhell merged commit ecdb034 into master Sep 3, 2014

sithhell deleted the cmake_simplification branch September 3, 2014 09:10

Titzi90 mentioned this pull request Sep 5, 2014

Dynamic linking error #1247

Closed

hkaiser mentioned this pull request Sep 13, 2014

Running HPX applications on Windows should not require setting %PATH% #503

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cmake simplification and various other minor changes #1204

Cmake simplification and various other minor changes #1204

sithhell commented Jul 28, 2014

hkaiser commented Aug 15, 2014

hkaiser commented Aug 15, 2014

sithhell commented Aug 25, 2014

hkaiser commented Aug 25, 2014

sithhell commented Aug 25, 2014

sithhell commented Sep 3, 2014

Cmake simplification and various other minor changes #1204

Cmake simplification and various other minor changes #1204

Conversation

sithhell commented Jul 28, 2014

hkaiser commented Aug 15, 2014

hkaiser commented Aug 15, 2014

sithhell commented Aug 25, 2014

hkaiser commented Aug 25, 2014

sithhell commented Aug 25, 2014

sithhell commented Sep 3, 2014