Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Feb 15, 2017
1 parent 48ccab5 commit 64968c7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
7 changes: 2 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ OPTION(WANT_OSX_DEPLOYMENT "OSX Deployment" OFF)
IF (WIN32 AND MSVC)
OPTION(WANT_MP_BUILD "Build with Multiple Processes (/MP)" OFF)
ENDIF ()


IF (UNIX AND NOT APPLE)
SET(WILDMIDI_CFG "/etc/wildmidi/wildmidi.cfg" CACHE STRING "default config location")
ELSE ()
Expand All @@ -56,6 +54,7 @@ IF ((NOT BUILD_SHARED_LIBS) AND (NOT WANT_STATIC))
MESSAGE(FATAL_ERROR "Neither dynamic nor static library build is selected.")
ENDIF ()


# Platform specific defines
IF (UNIX)
# allow 'large' files in 32 bit builds
Expand Down Expand Up @@ -84,11 +83,9 @@ IF (OPENBSD) # Set RPATH for OpenBSD so WildMIDI can find libWildMidi.so
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
IF ("${isSystemDir}" STREQUAL "-1")
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
ENDIF ("${isSystemDir}" STREQUAL "-1")

ENDIF ()
ENDIF (OPENBSD)


IF (WIN32)
ADD_DEFINITIONS(
-DNOMINMAX
Expand Down
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ IF (BUILD_SHARED_LIBS)
COMPILE_DEFINITIONS "WILDMIDI_BUILD;SYM_VISIBILITY"
COMPILE_FLAGS "-fvisibility=hidden"
)
#ELSEIF(HAVE_LDSCOPE_HIDDEN AND HAVE_VISIBILITY_DEFAULT) # SunPro (__SUNPRO_C >= 0x590)
# SET_TARGET_PROPERTIES(libwildmidi_dynamic PROPERTIES
# COMPILE_DEFINITIONS "WILDMIDI_BUILD;SYM_VISIBILITY"
# COMPILE_FLAGS "-xldscope=hidden"
# )
#ELSEIF (HAVE_LDSCOPE_HIDDEN AND HAVE_VISIBILITY_DEFAULT) # SunPro (__SUNPRO_C >= 0x590)
# SET_TARGET_PROPERTIES(libwildmidi_dynamic PROPERTIES
# COMPILE_DEFINITIONS "WILDMIDI_BUILD;SYM_VISIBILITY"
# COMPILE_FLAGS "-xldscope=hidden"
# )
ELSEIF (HAVE_LDSCOPE_HIDDEN AND HAVE_LDSCOPE_GLOBAL) # SunPro (__SUNPRO_C >= 0x550)
SET_TARGET_PROPERTIES(libwildmidi_dynamic PROPERTIES
COMPILE_DEFINITIONS "WILDMIDI_BUILD;SYM_LDSCOPE"
Expand Down

0 comments on commit 64968c7

Please sign in to comment.