diff --git a/CMakeLists.txt b/CMakeLists.txt index d8bc1bbe..5c16cf63 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.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 index e3c011c0..d975da3f 100644 --- 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 $) +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 $) + 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}