Make CMakeLists Files More Consistent

Fixes #25
OpenDDS · Oct 8, 2021 · 6498ba9 · 6498ba9
1 parent 5b458e9
commit 6498ba9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pyopendds/dev/itl2py/templates/CMakeLists.txt b/pyopendds/dev/itl2py/templates/CMakeLists.txt
@@ -1,4 +1,4 @@
-# NOTE: This CMake files should not be built on it's own. It's meant to be
+# NOTE: This CMake files should not be built on its own. It's meant to be
 # built as part of the Python package.
 cmake_minimum_required(VERSION 3.12)
 project({{ native_package_name }} CXX)

diff --git a/tests/basic_test/CMakeLists.txt b/tests/basic_test/CMakeLists.txt
@@ -1,8 +1,9 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
+project(PyOpenDDS_Test CXX)
 
-project(PyOpenDDS_Test)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND CMAKE_MODULE_PATH "$ENV{DDS_ROOT}/cmake")
 find_package(OpenDDS REQUIRED)
 
 add_library(basic_idl SHARED)

diff --git a/tests/itl2py_test/CMakeLists.txt b/tests/itl2py_test/CMakeLists.txt
@@ -1,8 +1,6 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
+project(pyopendds_itl2py_test CXX)
 
-project(pyopendds_itl2py_test)
-
-list(APPEND CMAKE_MODULE_PATH "$ENV{DDS_ROOT}/cmake")
 find_package(OpenDDS REQUIRED)
 
 add_library(itl2py_test_idl SHARED)