Skip to content

Commit

Permalink
There is no need specify cmake minimal version in .cmake files
Browse files Browse the repository at this point in the history
Also fixes building with cmake 3.x

IoT.js-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
  • Loading branch information
lygstate committed Jan 27, 2021
1 parent 7fdafb0 commit e76eb08
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 20 deletions.
2 changes: 0 additions & 2 deletions cmake/JSONParser.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

cmake_minimum_required(VERSION 2.8)

if (DEFINED JSonParserGuard)
return()
endif()
Expand Down
2 changes: 0 additions & 2 deletions cmake/http-parser.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 2.8)

if("${TARGET_OS}" MATCHES "NUTTX|TIZENRT")
set(HTTPPARSER_NUTTX_ARG -DNUTTX_HOME=${TARGET_SYSTEMROOT})
endif()
Expand Down
2 changes: 0 additions & 2 deletions cmake/iotjs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 2.8)

if(NOT DEFINED PYTHON)
set(PYTHON "python")
endif()
Expand Down
2 changes: 0 additions & 2 deletions cmake/jerry.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 2.8)

# Host jerry for snapshot generation
set(DEPS_HOST_JERRY deps/jerry-host)
ExternalProject_Add(hostjerry
Expand Down
19 changes: 9 additions & 10 deletions cmake/libtuv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 2.8)

# Configure external libtuv
set(DEPS_TUV deps/libtuv)
set(DEPS_TUV_SRC ${ROOT_DIR}/${DEPS_TUV})
Expand Down Expand Up @@ -58,13 +56,14 @@ set(TUV_LIBS tuv)

if("${TARGET_OS}" STREQUAL "MOCK" OR
"${TARGET_OS}" STREQUAL "LINUX")
list(APPEND TUV_LIBS pthread)
target_link_libraries(tuv INTERFACE pthread)
elseif("${TARGET_OS}" STREQUAL "WINDOWS")
list(APPEND TUV_LIBS
ws2_32.lib
UserEnv.lib
advapi32.lib
iphlpapi.lib
psapi.lib
shell32.lib)
target_link_libraries(tuv INTERFACE
ws2_32.lib
UserEnv.lib
advapi32.lib
iphlpapi.lib
psapi.lib
shell32.lib
)
endif()
2 changes: 0 additions & 2 deletions cmake/mbedtls.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 2.8)

set(MODULE_NAME "tls")

if ("${TARGET_OS}" STREQUAL "TIZENRT")
Expand Down

0 comments on commit e76eb08

Please sign in to comment.