Skip to content

Commit

Permalink
Reviev v2
Browse files Browse the repository at this point in the history
  • Loading branch information
piaskowyk committed Nov 26, 2024
1 parent 9cb8231 commit d61a112
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,13 @@ if(HERMES_IS_ANDROID)

endif()

if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
# MSCV requires c++20
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()
set(CMAKE_CXX_STANDARD 17)
# if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
# # MSCV requires c++20
# set(CMAKE_CXX_STANDARD 20)
# else()
# set(CMAKE_CXX_STANDARD 17)
# endif()

set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
14 changes: 7 additions & 7 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ add_library(hermesvm SHARED dummy.cpp)
add_library(hermesvmlean SHARED dummy.cpp)

# Do not build a framework for the test suite.
if(NOT HERMES_ENABLE_TEST_SUITE)
if(HERMES_BUILD_APPLE_FRAMEWORK)
if(APPLE)
set_target_properties(hermesvm PROPERTIES OUTPUT_NAME hermes)

Expand All @@ -186,12 +186,12 @@ if(NOT HERMES_ENABLE_TEST_SUITE)
COMMAND /usr/libexec/PlistBuddy -c "Add :MinimumOSVersion string ${CMAKE_OSX_DEPLOYMENT_TARGET}" $<TARGET_FILE_DIR:hermesvm>/Info.plist
)

install(TARGETS hermesvm
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
FRAMEWORK DESTINATION Library/Frameworks/${HERMES_APPLE_TARGET_PLATFORM}
)
# install(TARGETS hermesvm
# RUNTIME DESTINATION bin
# LIBRARY DESTINATION lib
# ARCHIVE DESTINATION lib
# FRAMEWORK DESTINATION Library/Frameworks/${HERMES_APPLE_TARGET_PLATFORM}
# )

install(DIRECTORY "${PROJECT_SOURCE_DIR}/API/hermes" DESTINATION include
FILES_MATCHING PATTERN "*.h"
Expand Down

0 comments on commit d61a112

Please sign in to comment.