Make lib and cmake target names the same as repository name, do NOT support cmake install multiple configurations simultaneously by ihsandemir · Pull Request #812 · hazelcast/hazelcast-cpp-client

ihsandemir · 2021-02-15T14:56:20Z

It is a problem for users when out library and github name is different from the cmake find_package name and library names. It becomes too confusing to the users and it is NOT recommended by package managers such as conan and vcpkg. Also, supporting different targets for ssl and static was not a good idea and source of confusion. The user configures it anyway when using cmake or package managers, hence, deleted those options.

Eliminated the generation of different targets for static and ssl and it will be only controlled by cmake options. Only a single type is supported per installation. The library and target names are also changed to the same name as the project hazelcast-cpp-client.

…nt from the cmake find_package name and library names. It becomes too confusing to the users and it is NOT recommended by package managers such as conan and vcpkg. Also, supporting different targets for ssl and static was not a good idea and source of confusion. The user configures it anyway when using cmake or package managers, hence, deleted those options. Eliminated the generation of different targets for static and ssl and it will be only controlled by cmake options. Only a single type is supported per installation. The library and target names are also changed to the same name as the project `hazelcast-cpp-client`.

devOpsHazelcast · 2021-02-15T15:17:41Z

Linux test FAILed.

devOpsHazelcast · 2021-02-15T15:22:54Z

Windows test FAILed.

…s is the standard recommended option name https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html Removed all the `BUILD_STATIC_LIB` flags and related documentation. Updated the scripts to work with the latest changes. Minor fixes for the copy ellision warning of std::move statements.

devOpsHazelcast · 2021-02-16T14:39:33Z

Windows test FAILed.

devOpsHazelcast · 2021-02-16T14:54:03Z

Linux test FAILed.

devOpsHazelcast · 2021-02-16T15:49:23Z

Windows test FAILed.

devOpsHazelcast · 2021-02-16T16:06:12Z

Linux test PASSed.

yemreinci · 2021-02-18T11:05:03Z

CMakeLists.txt



-function(add_hazelcast_library name type)
+function(add_hazelcast_library type)


I guess now that we work with a single type of library during the build, we can remove this function and put its contents in the global scope.

yemreinci · 2021-02-18T11:08:14Z

README.md

+cmake .. -DWITH_OPENSSL=ON -DBUILD_SHARED_LIBS=OFF
 ```
-Build both the shared and static library without SSL support:
+Build both the shared library without SSL support:


I think we can delete this example, because it does the same with the default cmake .. (SSL is off by default).
The above example alone is explanatory enough.

You may also consider removing the section header "1.1.5.2.1" completely, and put the above example under "1.1.5.2".

Deleted the line. Removed the section "1.1.5.2.1".

yemreinci · 2021-02-18T11:09:53Z

README.md

-
-The package name depends on the specific library type you want to use. 
-Options are `hazelcastcxx`, `hazelcastcxx_ssl`, `hazelcastcxx_static`, and `hazelcastcxx_ssl_static`.
+target_link_libraries(mytarget PRIVATE hazelcast-cpp-client)


namespace is missing.

Suggested change

target_link_libraries(mytarget PRIVATE hazelcast-cpp-client)

target_link_libraries(mytarget PRIVATE hazelcast-cpp-client::hazelcast-cpp-client)

README.md

yemreinci · 2021-02-18T11:14:34Z

README.md

 * `DISABLE_LOGGING` : Setting this option to `ON` disables logging. The default is `OFF`.

 ##### 1.1.5.2.1 Example Configuration Commands
 Build only the static library with SSL support:


Since building both is not supported anymore, we may drop "only".

Suggested change

Build only the static library with SSL support:

Build the static library with SSL support:

scripts/do-all-unix.sh

scripts/do-all-windows.bat

yemreinci · 2021-02-18T11:30:52Z

cmake/config.cmake.in

 endif()

-include(${CMAKE_CURRENT_LIST_DIR}/@name@-targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/hazelcast-cpp-client-targets.cmake)


@PROJECT_NAME@ can be used in this file.

…indows test so that gtest.dll can be found during running the test executable.

Co-authored-by: yemreinci <18687880+yemreinci@users.noreply.github.com>

devOpsHazelcast · 2021-02-18T14:38:35Z

Linux test PASSed.

devOpsHazelcast · 2021-02-18T14:47:30Z

Windows test PASSed.

devOpsHazelcast · 2021-02-18T14:53:36Z

Linux test PASSed.

devOpsHazelcast · 2021-02-18T15:02:10Z

Linux test PASSed.

devOpsHazelcast · 2021-02-18T15:22:02Z

Windows test PASSed.

devOpsHazelcast · 2021-02-18T15:56:04Z

Windows test PASSed.

* Added Hazelcast C++ client (https://github.com/hazelcast/hazelcast-cpp-client) port for Hazelcast in-memory database. * Fixed the patch (The generated cmake files destination is corrected.) * Updated the patch. see hazelcast/hazelcast-cpp-client#812 * Disable uwp support. * Added the missing version file for hazelcast-cpp-client. * [hazelcast-cpp-client] Avoid checking in large patch file * Format vcpkg.json * Updated the version for the latest commit using the command `./vcpkg x-add-version --overwrite-version hazelcast-cpp-client`. Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>

ihsandemir added the Type: Enhancement label Feb 15, 2021

ihsandemir added this to the 4.1 milestone Feb 15, 2021

ihsandemir requested review from sancar, yemreinci and yuce February 15, 2021 14:56

ihsandemir self-assigned this Feb 15, 2021

sancar previously approved these changes Feb 16, 2021

View reviewed changes

ihsandemir dismissed sancar’s stale review via 72394ca February 16, 2021 14:33

Corrected the produced cmake config destination directories.

3bf5ae9

ihsandemir added a commit to ihsandemir/vcpkg that referenced this pull request Feb 17, 2021

Updated the patch. see hazelcast/hazelcast-cpp-client#812

52229c4

yemreinci suggested changes Feb 18, 2021

View reviewed changes

ihsandemir and others added 3 commits February 18, 2021 17:12

Added path %BUILD_DIR%\bin\%BUILD_CONFIGURATION% when running the w…

2ca67da

…indows test so that gtest.dll can be found during running the test executable.

Review comment fixes.

a84a983

Apply suggestions from code review

67970a6

Co-authored-by: yemreinci <18687880+yemreinci@users.noreply.github.com>

ihsandemir requested review from sancar and yemreinci February 18, 2021 14:30

yemreinci approved these changes Feb 18, 2021

View reviewed changes

ihsandemir merged commit 691238b into hazelcast:master Feb 19, 2021

ihsandemir deleted the fix_cmake_targets branch February 19, 2021 08:33

ihsandemir mentioned this pull request Feb 19, 2021

[hazelcast-cpp-client] Add new port microsoft/vcpkg#16235

Merged

ihsandemir modified the milestones: 4.1, 4.0.1 Feb 26, 2021



		function(add_hazelcast_library name type)
		function(add_hazelcast_library type)

	target_link_libraries(mytarget PRIVATE hazelcast-cpp-client)
	target_link_libraries(mytarget PRIVATE hazelcast-cpp-client::hazelcast-cpp-client)

	Build only the static library with SSL support:
	Build the static library with SSL support:

Conversation

ihsandemir commented Feb 15, 2021

Uh oh!

devOpsHazelcast commented Feb 15, 2021

Uh oh!

devOpsHazelcast commented Feb 15, 2021

Uh oh!

devOpsHazelcast commented Feb 16, 2021

Uh oh!

devOpsHazelcast commented Feb 16, 2021

Uh oh!

devOpsHazelcast commented Feb 16, 2021

Uh oh!

devOpsHazelcast commented Feb 16, 2021

Uh oh!

yemreinci Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

ihsandemir Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

yemreinci Feb 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ihsandemir Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

yemreinci Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yemreinci Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

yemreinci Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

ihsandemir Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

devOpsHazelcast commented Feb 18, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

yemreinci Feb 18, 2021 •

edited

Loading