Skip to content

Commit e76eb08

Browse files
committed
There is no need specify cmake minimal version in .cmake files
Also fixes building with cmake 3.x IoT.js-DCO-1.0-Signed-off-by: Yonggang Luo luoyonggang@gmail.com
1 parent 7fdafb0 commit e76eb08

File tree

6 files changed

+9
-20
lines changed

6 files changed

+9
-20
lines changed

cmake/JSONParser.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3535
# SOFTWARE.
3636

37-
cmake_minimum_required(VERSION 2.8)
38-
3937
if (DEFINED JSonParserGuard)
4038
return()
4139
endif()

cmake/http-parser.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 2.8)
16-
1715
if("${TARGET_OS}" MATCHES "NUTTX|TIZENRT")
1816
set(HTTPPARSER_NUTTX_ARG -DNUTTX_HOME=${TARGET_SYSTEMROOT})
1917
endif()

cmake/iotjs.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 2.8)
16-
1715
if(NOT DEFINED PYTHON)
1816
set(PYTHON "python")
1917
endif()

cmake/jerry.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 2.8)
16-
1715
# Host jerry for snapshot generation
1816
set(DEPS_HOST_JERRY deps/jerry-host)
1917
ExternalProject_Add(hostjerry

cmake/libtuv.cmake

+9-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 2.8)
16-
1715
# Configure external libtuv
1816
set(DEPS_TUV deps/libtuv)
1917
set(DEPS_TUV_SRC ${ROOT_DIR}/${DEPS_TUV})
@@ -58,13 +56,14 @@ set(TUV_LIBS tuv)
5856

5957
if("${TARGET_OS}" STREQUAL "MOCK" OR
6058
"${TARGET_OS}" STREQUAL "LINUX")
61-
list(APPEND TUV_LIBS pthread)
59+
target_link_libraries(tuv INTERFACE pthread)
6260
elseif("${TARGET_OS}" STREQUAL "WINDOWS")
63-
list(APPEND TUV_LIBS
64-
ws2_32.lib
65-
UserEnv.lib
66-
advapi32.lib
67-
iphlpapi.lib
68-
psapi.lib
69-
shell32.lib)
61+
target_link_libraries(tuv INTERFACE
62+
ws2_32.lib
63+
UserEnv.lib
64+
advapi32.lib
65+
iphlpapi.lib
66+
psapi.lib
67+
shell32.lib
68+
)
7069
endif()

cmake/mbedtls.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 2.8)
16-
1715
set(MODULE_NAME "tls")
1816

1917
if ("${TARGET_OS}" STREQUAL "TIZENRT")

0 commit comments

Comments
 (0)