Commit 19f2b663 by Jessica Hawkwell

spiffying the build system

1 parent daa95d5e
...@@ -5,9 +5,9 @@ set(CMAKE_CXX_STANDARD 14) ...@@ -5,9 +5,9 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY build/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY build/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/lib)
if (EXISTS /usr/local/include) if (EXISTS /usr/local/include)
include_directories(/usr/local/include) include_directories(/usr/local/include)
......
...@@ -38,13 +38,13 @@ PROJECT_NAME = "Nitrogen Desktop Experience" ...@@ -38,13 +38,13 @@ PROJECT_NAME = "Nitrogen Desktop Experience"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = PROJECT_NUMBER = 1.0.0.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short. # quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF = PROJECT_BRIEF = "Desktop Environment for BSD systems."
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55 # in the documentation. The maximum height of the logo should not exceed 55
...@@ -1780,7 +1780,7 @@ LATEX_BIB_STYLE = plain ...@@ -1780,7 +1780,7 @@ LATEX_BIB_STYLE = plain
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag GENERATE_LATEX is set to YES. # This tag requires that the tag GENERATE_LATEX is set to YES.
LATEX_TIMESTAMP = NO LATEX_TIMESTAMP = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to the RTF output # Configuration options related to the RTF output
...@@ -1856,7 +1856,7 @@ RTF_SOURCE_CODE = NO ...@@ -1856,7 +1856,7 @@ RTF_SOURCE_CODE = NO
# classes and files. # classes and files.
# The default value is: NO. # The default value is: NO.
GENERATE_MAN = NO GENERATE_MAN = YES
# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
...@@ -1890,7 +1890,7 @@ MAN_SUBDIR = ...@@ -1890,7 +1890,7 @@ MAN_SUBDIR =
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag GENERATE_MAN is set to YES. # This tag requires that the tag GENERATE_MAN is set to YES.
MAN_LINKS = NO MAN_LINKS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to the XML output # Configuration options related to the XML output
......
...@@ -8,3 +8,5 @@ link_libraries(${X11_LIBRARIES}) ...@@ -8,3 +8,5 @@ link_libraries(${X11_LIBRARIES})
add_executable(${PROJECT_NAME} NUtils.cpp NWMAction.cpp NWManager.cpp main.cpp) add_executable(${PROJECT_NAME} NUtils.cpp NWMAction.cpp NWManager.cpp main.cpp)
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ntk) target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ntk)
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
...@@ -10,9 +10,9 @@ add_library(${PROJECT_NAME} SHARED ndeMain.cpp ...@@ -10,9 +10,9 @@ add_library(${PROJECT_NAME} SHARED ndeMain.cpp
nitrogen/NPosition.cpp nitrogen/NPosition.cpp
nitrogen/NSize.cpp) nitrogen/NSize.cpp)
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/${PROJECT_NAME})
file(GLOB HEADERS "*.h")
install(FILES ${HEADERS} DESTINATION include/${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${BoehmGC} ${CORD}) target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${BoehmGC} ${CORD})
target_include_directories (nde PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (nde PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install(FILES ${PROJECT_NAME}.h DESTINATION include)
install(DIRECTORY nitrogen DESTINATION include FILES_MATCHING PATTERN "*.h")
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib)
...@@ -24,9 +24,9 @@ nitrogen/nwt/NWTEvent.cpp ...@@ -24,9 +24,9 @@ nitrogen/nwt/NWTEvent.cpp
) )
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/${PROJECT_NAME})
file(GLOB HEADERS "*.h")
install(FILES ${HEADERS} DESTINATION include/nitrogen/)
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ${BoehmGC}) target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ${BoehmGC})
target_include_directories (ntk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (ntk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install(FILES ${PROJECT_NAME}.h DESTINATION include)
install(DIRECTORY nitrogen DESTINATION include FILES_MATCHING PATTERN "*.h")
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib)
xsetroot -solid grey & xsetroot -solid grey &
xterm & xterm &
exec src/NitroWin/build/bin/NitroWin exec build/bin/NitroWin
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!