diff --git CMakeLists.txt CMakeLists.txt index 9f8009a..eb61c88 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -8,13 +8,6 @@ set(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}) set(CT_VERSION_WINDOWS ${CMAKE_MATCH_1},${CMAKE_MATCH_2},${CMAKE_MATCH_3},0) message(STATUS "CT_VERSION = ${CT_VERSION}") -# APPLE has issues with installing in /usr/bin because of SIP -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND APPLE) - set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "..." FORCE) -elseif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) -endif() - if(NOT PYTHON_EXEC) set(PYTHON_EXEC "python3") endif(NOT PYTHON_EXEC) @@ -80,10 +73,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() if(APPLE) - link_directories(/usr/local/lib /usr/local/opt/gettext/lib) - include_directories(/usr/local/opt/gettext/include) - set(CMAKE_MACOSX_RPATH 1) - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/libxml++/lib/pkgconfig") # to fix libxml++2.6 compilation add_compile_options(-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR) endif() @@ -190,11 +179,6 @@ execute_process( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) -# set icon on macos -if(APPLE) - install(CODE "execute_process(COMMAND ${PYTHON_EXEC} ${CMAKE_SOURCE_DIR}/scripts/set_icon_macos.py ${CMAKE_SOURCE_DIR}/icons/cherrytree.ico ${CMAKE_INSTALL_PREFIX}/bin/cherrytree)") -endif(APPLE) - # install other files if(${CMAKE_SYSTEM_NAME} MATCHES Linux|.*BSD|DragonFly|Darwin) if(NOT APPLE)