Merge pull request #1115 from borglab/cmake-fixes

borglab · Feb 21, 2022 · d5a3a22 · d5a3a22
2 parents 715a877 + b72b65d
commit d5a3a22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,3 @@
-project(GTSAM CXX C)
 cmake_minimum_required(VERSION 3.0)
 
 # new feature to Cmake Version > 2.8.12
@@ -19,6 +18,11 @@ if (${GTSAM_VERSION_PATCH} EQUAL 0)
 else()
     set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}${GTSAM_PRERELEASE_VERSION}")
 endif()
+
+project(GTSAM
+        LANGUAGES CXX C
+        VERSION "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}")
+
 message(STATUS "GTSAM Version: ${GTSAM_VERSION_STRING}")
 
 set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -3,14 +3,14 @@
 set (tests_exclude "")
 
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") # might not be best test - Richard & Jason & Frank
-	# clang linker segfaults on large testSerializationSLAM 
-	list (APPEND tests_exclude "testSerializationSLAM.cpp") 
+	# clang linker segfaults on large testSerializationSlam 
+	list (APPEND tests_exclude "testSerializationSlam.cpp") 
 endif()
 
 # Build tests
 gtsamAddTestsGlob(tests "test*.cpp" "${tests_exclude}" "gtsam")
 
 if(MSVC)
-	set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationSLAM.cpp"
+	set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationSlam.cpp"
 		APPEND PROPERTY COMPILE_FLAGS "/bigobj")
 endif()