From 51b281ba56c67632b8e0f9f578ad638e19a7406e Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Thu, 21 Mar 2024 16:25:12 +0900 Subject: [PATCH 1/2] Convert libmujincontrollerclient to object library --- src/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d975da3f..e3c011c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,9 @@ if (libzmq_FOUND) set(SOURCE_FILES ${SOURCE_FILES} binpickingtaskzmq.h binpickingtaskzmq.cpp mujinzmq.cpp) endif() -add_library(libmujincontrollerclient SHARED ${SOURCE_FILES}) +add_library(libmujincontrollerclientbase OBJECT ${SOURCE_FILES}) + +add_library(libmujincontrollerclient SHARED $) if( EXTRA_MSVC_DEPEND ) message(STATUS "adding msvc_boost dependency") add_dependencies(libmujincontrollerclient ${EXTRA_MSVC_DEPEND}) @@ -63,7 +65,7 @@ if( OPT_BUILD_STATIC ) set(LIBMUJINCONTROLLERCLIENT_NAME mujincontrollerclient${MUJINCLIENT_LIBRARY_SUFFIX}) endif() - add_library(libmujincontrollerclient_static STATIC ${SOURCE_FILES}) + add_library(libmujincontrollerclient_static STATIC $) set_target_properties(libmujincontrollerclient_static PROPERTIES OUTPUT_NAME ${LIBMUJINCONTROLLERCLIENT_NAME} SOVERSION 0 # always have it 0 since we're including the soversion as part of the library name VERSION ${MUJINCLIENT_VERSION} From 7aca61ec12cf1b2c585ade09005558118cbb6583 Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Thu, 21 Mar 2024 16:25:47 +0900 Subject: [PATCH 2/2] bump cmake_minimum_required to 2.8.8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c4d27d8..050190d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required (VERSION 2.8.0) +cmake_minimum_required (VERSION 2.8.8) project(mujincontrollerclient) set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )