This commit is contained in:
NissimHadar 2019-01-18 17:14:39 -08:00
parent 108a308a97
commit 628a420f91
2 changed files with 3 additions and 3 deletions

View file

@ -32,8 +32,8 @@ if (BUILD_TOOLS)
set_target_properties(oven PROPERTIES FOLDER "Tools") set_target_properties(oven PROPERTIES FOLDER "Tools")
# No need to build on Android or in a Production build # No need to build on Android or in a Production build
if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION") ##if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
add_subdirectory(nitpick) add_subdirectory(nitpick)
set_target_properties(nitpick PROPERTIES FOLDER "Tools") set_target_properties(nitpick PROPERTIES FOLDER "Tools")
endif() ##endif()
endif() endif()

View file

@ -131,7 +131,7 @@ endforeach()
# include headers for nitpick and NitpickConfig. # include headers for nitpick and NitpickConfig.
include_directories("${PROJECT_SOURCE_DIR}/src") include_directories("${PROJECT_SOURCE_DIR}/src")
if (UNIX) if (UNIX AND NOT ANDROID)
if (CMAKE_SYSTEM_NAME MATCHES "Linux") if (CMAKE_SYSTEM_NAME MATCHES "Linux")
# Linux # Linux
target_link_libraries(${TARGET_NAME} pthread atomic) target_link_libraries(${TARGET_NAME} pthread atomic)