Merge branch 'setDefaultGeometryValue' into githubaction_setDefaultGe…

…ometryValue
mujin · Apr 30, 2024 · 43727be · 43727be
2 parents 9468950 + d08350b
commit 43727be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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.8)
+cmake_minimum_required (VERSION 2.8.0)
 project(mujincontrollerclient)
 set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,9 +35,7 @@ if (libzmq_FOUND)
   set(SOURCE_FILES ${SOURCE_FILES} binpickingtaskzmq.h binpickingtaskzmq.cpp mujinzmq.cpp)
 endif()
 
-add_library(libmujincontrollerclientbase OBJECT ${SOURCE_FILES})
-
-add_library(libmujincontrollerclient SHARED $<TARGET_OBJECTS:libmujincontrollerclientbase>)
+add_library(libmujincontrollerclient SHARED ${SOURCE_FILES})
 if( EXTRA_MSVC_DEPEND )
   message(STATUS "adding msvc_boost dependency")
   add_dependencies(libmujincontrollerclient ${EXTRA_MSVC_DEPEND})
@@ -65,7 +63,7 @@ if( OPT_BUILD_STATIC )
     set(LIBMUJINCONTROLLERCLIENT_NAME mujincontrollerclient${MUJINCLIENT_LIBRARY_SUFFIX})
   endif()
 
-  add_library(libmujincontrollerclient_static STATIC $<TARGET_OBJECTS:libmujincontrollerclientbase>)
+  add_library(libmujincontrollerclient_static STATIC ${SOURCE_FILES})
   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}