Skip to content

Commit

Permalink
fix cmake for travis attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
mjoppich committed May 15, 2019
1 parent 71cf890 commit fedf3ec
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if (APPLE)
message(STATUS ">>> Apple")
set(Qt5_DIR "/Users/joppich/Qt/5.12.3/clang_64/")
set(OPENSSL_ROOT_DIR "/usr/local/Cellar/openssl/1.0.2r/")
set(LUA_DIR "/usr/local/Cellar/lua/5.3.5_1")
set(LUA_DIR "/usr/local/Cellar/lua/5.3.5_1")
set(LUA_LIBRARIES "/usr/local/Cellar/lua/5.3.5_1/lib/liblua.5.3.5.dylib")
set(LUA_LIBRARY "/usr/local/Cellar/lua/5.3.5_1/lib/liblua.5.3.5.dylib")

Expand Down Expand Up @@ -120,7 +120,7 @@ if (UNIX AND NOT APPLE)
message(STATUS ">>> Linux")

set(Qt5_DIR "")
LIST(APPEND Qt5_DIR "/home/markus/Qt/5.12.3/gcc_64/" "~/Qt/5.8/gcc_64/" "~/Qt/5.7/gcc_64/" "/usr/local/qt/5.11.1/gcc_64/" "/home/mjoppich/qt/qt-everywhere-src-5.10.0/qtbase" "/opt/Qt5.11.1/5.11.1/gcc_64/" "/opt/Qt5.10.0/5.10.0/gcc_64/")
LIST(APPEND Qt5_DIR "/home/markus/Qt/5.12.3/gcc_64/" "~/Qt/5.8/gcc_64/" "~/Qt/5.7/gcc_64/" "/usr/local/qt/5.11.1/gcc_64/" "/opt/Qt5.11.1/" "/home/mjoppich/qt/qt-everywhere-src-5.10.0/qtbase" "/opt/Qt5.11.1/5.11.1/gcc_64/" "/opt/Qt5.10.0/5.10.0/gcc_64/")

set(ENV{OPENSSL_ROOT_DIR} "/home/users/joppich/libs/openssl/")
set(ENV{LUA_DIR} "/home/users/joppich/libs/lua/")
Expand Down Expand Up @@ -167,7 +167,7 @@ endif()

set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")

find_package(Lua 5.2.4 REQUIRED)
find_package(Lua 5.2 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})

message(STATUS " *** Lua include: ${LUA_INCLUDE_DIR}")
Expand Down Expand Up @@ -246,24 +246,24 @@ find_package(Qt5Network REQUIRED PATHS ${Qt5_DIR} NO_DEFAULT_PATH)
find_package(Qt5Xml REQUIRED PATHS ${Qt5_DIR} NO_DEFAULT_PATH)
find_package(Qt5XmlPatterns REQUIRED PATHS ${Qt5_DIR} NO_DEFAULT_PATH)

add_project_meta(META_FILES_TO_INCLUDE)
add_project_meta(META_FILES_TO_INCLUDE1)
add_project_meta(META_FILES_TO_INCLUDE)
add_project_meta(META_FILES_TO_INCLUDE1)
add_project_meta(META_FILES_TO_INCLUDE2)


if (APPLE)
set(BIOGUI_NETOWRK_INI "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
set_source_files_properties(${BIOGUI_NETOWRK_INI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
LIST(APPEND META_FILES_TO_INCLUDE "${BIOGUI_NETOWRK_INI}")

LIST(APPEND META_FILES_TO_INCLUDE "${BIOGUI_NETOWRK_INI}")

set(BIOGUI_TEMPLATES_GUI "${CMAKE_CURRENT_SOURCE_DIR}/templates/WSL_install.gui")
set_source_files_properties(${BIOGUI_TEMPLATES_GUI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/templates/)
LIST(APPEND META_FILES_TO_INCLUDE1 "${BIOGUI_TEMPLATES_GUI}")
LIST(APPEND META_FILES_TO_INCLUDE1 "${BIOGUI_TEMPLATES_GUI}")

set(BIOGUI_TEMPLATES_CIRCLATOR_GUI "${CMAKE_CURRENT_SOURCE_DIR}/templates/circlator_docker.gui")
set_source_files_properties(${BIOGUI_TEMPLATES_CIRCLATOR_GUI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/templates/)
LIST(APPEND META_FILES_TO_INCLUDE1 "${BIOGUI_TEMPLATES_GUI}")

LIST(APPEND META_FILES_TO_INCLUDE1 "${BIOGUI_TEMPLATES_GUI}")

set(BIOGUI_LOGO_FILE "${CMAKE_CURRENT_SOURCE_DIR}/biogui_logo.png")
set_source_files_properties(${BIOGUI_LOGO_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/)
LIST(APPEND META_FILES_TO_INCLUDE1 "${BIOGUI_TEMPLATES_GUI}")
Expand Down Expand Up @@ -308,7 +308,7 @@ install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX} )
message(STATUS "files to copy ${META_FILES_TO_INCLUDE}")
message(STATUS "exe location ${PROJECT_BINARY_DIR}")
message(STATUS "to change install location set: -DCMAKE_INSTALL_PREFIX=/where/you/want/")
message(STATUS "installing to: ${CMAKE_INSTALL_PREFIX}")
message(STATUS "installing to: ${CMAKE_INSTALL_PREFIX}")
message(STATUS APPLE)

file(GLOB biogui_files
Expand All @@ -318,7 +318,7 @@ file(GLOB biogui_files

install(FILES ${biogui_files} DESTINATION ${CMAKE_INSTALL_PREFIX})

if (NOT APPLE)
if (NOT APPLE)
message(STATUS "IN NOT APPLE")

file(GLOB biogui_ini_files
Expand All @@ -329,8 +329,8 @@ if (NOT APPLE)

file(GLOB biogui_templates
"${CMAKE_CURRENT_SOURCE_DIR}/templates/WSL_install.gui"
)

)

install(DIRECTORY DESTINATION ${CMAKE_INSTALL_PREFIX}/install_templates)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_PREFIX}/templates)

Expand Down

0 comments on commit fedf3ec

Please sign in to comment.