Skip to content

Commit c5bfd3f

Browse files
committed
fix build
1 parent fe98191 commit c5bfd3f

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/OBJ_*/
2+
/build/
23
*.xpl
34
/*.zip
45
version.h

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ if(WIN32)
9898
-l:libexpat.a
9999
pthread
100100
)
101-
install(TARGETS openSAM DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/win_x64")
101+
install(TARGETS openSAM RUNTIME DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/win_x64")
102102

103103
elseif(APPLE)
104104
# Makefile.mac64 (native macOS or osxcross)
@@ -122,7 +122,7 @@ elseif(APPLE)
122122
set(_expat expat) # ships with macOS / Homebrew / MacPorts natively
123123
endif()
124124
target_link_libraries(openSAM PRIVATE ${XPLM_FW} ${XPWIDGETS_FW} ${_expat})
125-
install(TARGETS openSAM DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/mac_x64")
125+
install(TARGETS openSAM LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/mac_x64")
126126

127127
elseif(UNIX)
128128
# Makefile.lin64
@@ -133,7 +133,7 @@ elseif(UNIX)
133133
)
134134
target_link_options(openSAM PRIVATE -rdynamic -nodefaultlibs)
135135
target_link_libraries(openSAM PRIVATE expat)
136-
install(TARGETS openSAM DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/lin_x64")
136+
install(TARGETS openSAM LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/openSAM-pkg/openSAM/lin_x64")
137137
endif()
138138

139139
# ==============================================================================

build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -S . -B build
2+
ninja -C build install

0 commit comments

Comments
 (0)