nephatrine/hello-test
nephatrine
/
hello-test
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix some small issues

This commit is contained in:
Daniel Wolf 2024-03-16 16:49:23 -04:00
parent c13159e8a8
commit ddff7f3e3b
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -22,7 +22,7 @@ project(HelloTest LANGUAGES CXX)
add_library(HelloWorld_Static STATIC "src/HelloWorld.cpp")
target_compile_features(HelloWorld_Static PUBLIC cxx_std_17)
target_include_directories(HelloWorld_Static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_compile_definitions(HelloWorld_Static INTERFACE HELLOWORLD_STATIC)
target_compile_definitions(HelloWorld_Static PUBLIC HELLOWORLD_STATIC)
set_target_properties(HelloWorld_Static PROPERTIES DEFINE_SYMBOL HELLOWORLD_EXPORTS)
set_target_properties(HelloWorld_Static PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/HelloWorld.hpp")
if(CMAKE_SYSTEM_NAME STREQUAL "MSDOS")
@ -48,6 +48,14 @@ include(CTest)
add_test(NAME HelloTest COMMAND $<TARGET_FILE:HelloTest>)
include(GNUInstallDirs)
if(DEFINED CMAKE_LIBRARY_ARCHITECTURE)
set(NX_INSTALL_LIBDIR "lib${NX_LIBPATH_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}")
elseif(DEFINED NX_LIBPATH_SUFFIX)
set(NX_INSTALL_LIBDIR "lib${NX_LIBPATH_SUFFIX}")
else()
set(NX_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
endif()
install(
TARGETS HelloTest
COMPONENT HelloTest_BIN
@ -55,13 +63,13 @@ install(
install(
TARGETS HelloWorld
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT HelloWorld_LIB
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT HelloWorld_DEV
LIBRARY DESTINATION "${NX_INSTALL_LIBDIR}" COMPONENT HelloWorld_LIB
ARCHIVE DESTINATION "${NX_INSTALL_LIBDIR}" COMPONENT HelloWorld_DEV
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT HelloWorld_DEV)
install(
TARGETS HelloWorld_Static
COMPONENT HelloWorld_DEV
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${NX_INSTALL_LIBDIR}"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md"

2
src/HelloWorld.cpp
View File

@ -20,7 +20,7 @@
#include <iostream>
int hello_world()
HELLOWORLD_EXPORT int hello_world()
{
std::cout << "HELLO WORLD!" << std::endl;
return 0;